rename packages
changes for new package layout