move classes in package 'query' to package 'sql'