Renamed files to match package