[IMP-dev] IMP reorg