Moved models in place and started using them.
Added some role and repo stuff