Split out model
Add config files