Made the imports in ide/codegen reflect the recent restructuring in the core part