Removed unnecessary files
Moved files around