#229: utils/Constants file can be removed
Moving a few files
Merge pull request #4 from andrerod/sql

Multiple fixes