Refactored some packages, minor tweaks to QUEST requirement