Adding new query command as default, old query command has been renamed to 'query-old'.
Renaming java file.