Rename configuration module
Move additional configuration into module