moved some classes back to the main package
merged the classes that implement Type back into their interface. With this, the simplification of the library is complete.