mv modules to core