rename files to new package structure