Move some entity classes around