refactoring all code
Merge branch 'master' of github.com:ndugger/vorge-engine