remove window class
add query and other query class files
before push