Start moving things in more logical places
This is just the beginning, I want to have distinguished sections to work with. Not the mess that it was