Renamed folders to follow convention