Moved some files around and did a bit more work on the combat system