Split repo code into multiple files
Merge branch 'NewStructure' into develop