move old modules to main module