move all current classes to core namespace.