Added query builder

Delinted files