adjusting imports and directory locations after reorg