Organize source files
Merge branch 'FileOrganization1'
Merge FileOrganization into master