Removed a few unnecessary files, moved files around