Need Code Organization

[Dimencia]

I'm still not happy with how everything's split up and organized in the code and files, and not really sure how to improve it - but any help with this would be great, just copy and paste the functions to somewhere that makes more sense than where they currently are