Matt: moving controllers out of global NS into module