Moving classes to .Core that are not intended for direct use