New file structure

Helps with submodules