Removed extraneous methods and split some trivial classes and typedefs into types.hpp