renamed folders for consistency