More reorg and some prep work on the broken quests
Fix several reported issues: #45 and #46
Merge pull request #14 from mangosvb/master

Merge Update