Moving main classes into Core subspec