Fix imports

src/lib/packet.c

@@ -1,7 +1,6 @@
 #include "packet.h"
 #include "key.h"
 #include "util.h"
-#include "server/server.h"
 
 /*
  * Print contents of packet

src/zen/db.c

@@ -1,9 +1,9 @@
 #include "config.h"
 #include "packet.h"
 #include "util.h"
-#include "client/ui.h"
-#include "client/db.h"
-#include "client/user.h"
+#include "zen/ui.h"
+#include "zen/db.h"
+#include "zen/user.h"
 
 sqlite3 *db;
 char zen_db_path[PATH_MAX];

src/zen/notification.c

@@ -1,5 +1,5 @@
-#include "notification.h"
 #include "util.h"
+#include "zen/notification.h"
 
 void send_notification(uint8_t *author, uint8_t *content)
 {

src/zen/ui.c

@@ -1,9 +1,9 @@
 #include "config.h"
 #include "packet.h"
 #include "util.h"
-#include "client/ui.h"
-#include "client/db.h"
-#include "client/user.h"
+#include "zen/ui.h"
+#include "zen/db.h"
+#include "zen/user.h"
 
 WINDOW *panel;
 WINDOW *users_border;
@@ -18,6 +18,7 @@ message_t messages[100];
 int num_messages = 0;
 long current_user = 0;
 int current_window = 0;
+int current_mode;
 int sockfd;
 
 /* For tracking cursor position in content */

src/zen/user.c

@@ -3,7 +3,7 @@
 
 #include "packet.h"
 #include "util.h"
-#include "client/user.h"
+#include "zen/user.h"
 
 ArrayList *arraylist_init(size_t capacity)
 {

src/zen/zen.c

@@ -1,11 +1,10 @@
 #include "config.h"
 #include "packet.h"
 #include "key.h"
-#include "notification.h"
 #include "util.h"
-#include "client/ui.h"
-#include "client/db.h"
-#include "server/server.h"
+#include "zen/notification.h"
+#include "zen/ui.h"
+#include "zen/db.h"
 
 /*
  * Authenticate with server by signing a challenge

src/zmr/zmr.c

@@ -1,8 +1,7 @@
 #include "packet.h"
 #include "util.h"
 #include "config.h"
-#include "notification.h"
-#include "server/server.h"
+#include "zmr/zmr.h"
 
 thread_t threads[MAX_THREADS];
 int num_thread = 0;