Renamed folders, removed unused tags
Last commit ignored this...