Cleanup on the TOMConfiguration. Removed several configuration parameters that do not make sense anymore. Besides that merged some packages and cleaned a bit more of code here and there.