+ Change configuration file layout for cleaner, more concise configuration