New file structure
Merge branch 'new_file_structure'