Removed unnecessary stuff
Moved files to subfolders