Merge "ConfigurationService to create default config dir"