Reorganization of RQL