Removed pkg dir
Finished modifying to call hashes instead of masters directly