seperate pkg and rename folders