Fixed a few small bugs and moved npcs files into the right folder