Altered config file layout

Use subcategories to organise everything better