Query order fix
Module and classes renaming