Organized everything
Fix some stuff
Fix some more stuff
Merge branch 'master' into organized