usage
add query.js
restructuring