Started refactoring

Moved old tests out of the way and started implementing the slightly
different DataType handling of user configuration.