diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -28,6 +28,7 @@
 #include "execio.h"
 #include "options.h"
 #include "distrenjob.h"
+#include "listen.h"
 #include "protocol.h"
 #include "slavefuncs.h"
 #include "asprintf.h"
@@ -50,15 +51,6 @@
 
 /* ******************* Structs ************************ */
 
-// Gets config info from confs
-struct distrend_config
-{
-  cfg_t *mycfg;
-  struct options_common *options;
-  struct distrend_listen **listens; /*< Null terminated array of structs */
-  char *datadir;
-};
-
 struct general_info {
   short int jobs_in_queue; //
   unsigned short int free_clients;
@@ -124,27 +116,6 @@ void distrend_action_free()
 {
 
 }
-/**
-   Start listening
-*/
-void distrend_listen()
-{
-
-}
-/**
-   Stop listening
-*/
-void distrend_unlisten()
-{
-
-}
-/**
-   This is probably just a placeholder for remotio
-*/
-void remotio_send_to_client()
-{
-	// I am futile!
-}
 
 /** Fill variables after crash / shutdown from XML dumps */
 int start_data(struct distrenjob *head, char *datadir)
@@ -1072,7 +1043,7 @@ int main(int argc, char *argv[])
   struct distrenjob head;
 
   int cont;
-  struct distrend_listenset *listenset;
+  struct distrend_clientset *clients;
   struct distrend_config *config;
 
   enum clientstatus
@@ -1217,7 +1188,7 @@ int main(int argc, char *argv[])
     }
   }
 
-  distrend_listen(&listenset, config);
+  distrend_listen(config, &clients);
   /* This is called the "main loop" */
   while(cont)
     {
@@ -1255,7 +1226,7 @@ int main(int argc, char *argv[])
       distrend_action_free(action);
     }
 
-  distrend_unlisten(listenset);
+  distrend_unlisten(config->listens, clients);
   distrend_config_free(config);
 
   xmlcleanup();