Minor refactoring
Unify configuration files