Rename main controller to topic one, clean up a bit