reorg dirs, do less to devstack-gate