Moving all core module to base module