Merge type system modules into core module

[reckart]

Describe the refactoring action
Move the contents of the type system modules into the core module and drop the type system modules.

Expected benefit
There is a split package between the core module and the type system modules which causes a problem in OSGI environments. The current OSGI-enabled build already does merge the contents of the type system modules into the core module. This now causes duplicate classes/resources if both the core and the type system modules are on the classpath (which is basically always the case since core has a dependency on them). So on the bottom line, if we just merge those modules into core and remove them otherwise, the world is a nicer place.