Renamed folders, removed unused files, added comments