MOVED core model to root package