Revert "add controller folders"

This reverts commit fd5b0bf5d368b33a645b4f993fc64b1c4ec2ab84.
decommid