Split core file out