All wrapper entity classes are now nested within their respective entity classes