Moving config files into conf