Renamed directories/files for compatibility