Revert "Minor changes to Weapon class, moved Weapon class"

This reverts commit ffdd9961f76a3427b7c5796f29bd7f9886f1be54.