rename packages and move files around