Make a few adjustments to accommodate different namespacing structure
Move config files to /etc