reorganize controllers
merge