Added Moq package
Some combat system refactoring