Settings code and structure cleanup

Summary: misc cleanup and feature organization

Test Plan: merge when done

Reviewers: synergy

Reviewed By: synergy

Differential Revision: http://review.codefirex.com/D664