Moved helper files to main sources to allow inclusion in other projects. Adding logging to all queries with SLF4J