Cleanup

deleted old folders and rollback and renamed folders/files