Reorganize execution_categories