moved core into main