Bugfix/11 weapon class

This will reorganize our source files.