Cosmetic changes
Moved SQL to its own package