Move class to core module