Moved test directory
Busy adding support for query project
Added support for merging records
Finished initial version of query project