Moved Player into Model and removed Factory