Reorganize settings

fixes #458.

do not merge yet, i want to get initial feedback.