Rearrange to proper"er" file structure.

The more I learn, The more I need to change things :)