update directory and naming structure of controllers