Renamed folders to match convention