Move traps into cave struct
Tidy up monster list