Revert "Moved thigns around to get them at the right place"

This reverts commit f0561317140f00109b06595c87bde59e483cfe8c.
Moved things around for proper structure