Revert "Organize controller"

This reverts commit 5467ddab7cf7a1c80e5421b8ef43c673184911d6.