Moved navigation core models from another project