Moved collections to separate files.
Add Query form.