Refactoring... (Almost done).
Merge https://github.com/Ivan-Dimitrov-bg/Labyrinth-3
Refactoring almost done...