Made settings structure more flexible

This will break people's current enviroments, manual migration will be
needed.