controller re-organization