renaming and moving all over
minor config tweak