Revert "Update- Better Code design"

Reverts Adri22/RPG#4