reorganize controllers