renamed Base* modules to Core*