Bunch of refactorings
Made changes to rename the package org.hit.db.query to org.hit.db.sql