Moved around some require's

Still very much wip