Move NPC skinsuits around, backing up changes made via CMS in issue #203