Organized folders.
Added Weapon-class.