Merge "[Settings] Code refactor for modulization"