Readded single NPC, cleaned up code a bit

Readded the singular NPC to fit in with the basic notion of single
responsibility. Changed structure of all objects to remove unnecessary
functions and simplify.