fix imports
extract existing generation for core components