Rules reorganization