Organize source files
Commit before push to Github
Merge branch 'FileOrganization'