WIP: reoganize settings

Change-Id: I15adecfa6288ce75370848cfad63548099798b61
Signed-off-by: bart452 <bart_96@live.nl>