Images in proper directory

Weapons belong in the weapons directory and NPCs belong in the NPC directory.
Merge pull request #2223 from niamu/images_cleanup

Images in proper directory