Move our Settings into OmniGears

Change-Id: If056d5aabbf07e53cf9825573c31568a5fef6658