Renamed directory structure correctly