Started refactor
Added schema.clj
Query refactor
Merge branch 'master' into database-api-refactor