Move Types into separate module
add configuration module