Move everything to one core subproject