New structure - 2 config files per #6