Revert "Use controllers in router"

This reverts commit 72581de192f274b3ed4e0010b8e8777d7221817b.