Revert "Refactor of packages. Separated models and controllers"

This reverts commit 49c1c1bb1a8a4629a6876debc7c4f1376929f291.
Refactored entire project with generated controllers and views