Refactor of packages. Separated models and controllers