Move code into core subproject