Organize source files
Merge branch 'FileOrganization'
I don’t know why I do this