Added new query devel module.
Renaming module
Reorganizing modules.