Revert "Violate architecture (on purpose)"
Revert "Violate architecture (on purpose)"

This reverts commit 389e0af666b5cde77c99c11e23979e6ad8b7133e.

terceiro/squad,terceiro/squad,terceiro/squad,terceiro/squad