Renamed files to new package name