Hygiene: Move settings into standalone module

Rename settings methods.

Change-Id: I7ec0be06ebd7dd7aea0622f8a0e44ca08834597c