Merge pull request #12 from TaviscaSolutions/refactoring

Refactoring
Merge pull request #13 from TaviscaSolutions/refactoring

Final Refactoring
Merge pull request #14 from TaviscaSolutions/main

Refactored version: Blue team