Moved things into modules. User model is passing tests

Next step is controllers