Organize source files
Merge branch 'FileOrganization2'