Add schema for Settings
Add folder model
Refactor to get rid of unnecessary layer