move controllers into modules