Models refactoring, init controllers