Moved RelevanceModel into the core system, cleaned up some packaging