move package to pim

also change the directories