Images in proper directory

Weapons belong in the weapons directory and NPCs belong in the NPC directory.

This resolves the last of our projectile bugs noted in #2220.