Organize source files
Merge branch 'FileOrganization1'
Merged with Master