Refactor Settings model to 2 separate models