[WIP] Settings restructuration