Refactored packages
Merge branch 'master' of https://github.com/colestew/mercurydb.git