Simplify api

and consolidate "settings" modules.