Rearrange controller directory structure