Organize source files
added some shit :)
Merge remote-tracking branch 'origin/master'
Merge branch 'FileOrganization'