Rename subdirectories for consistency