diff --git a/Makefile.am b/Makefile.am
index 9049375a..c301a5ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,16 @@
 bin_PROGRAMS = profanity
-profanity_SOURCES = src/command.c src/contact.c src/command_history.c src/xmpp.h \
+profanity_SOURCES = src/command.c src/contact.c src/command_history.c \
 	src/preferences.c src/autocomplete.c src/ui_statusbar.c \
 	src/command.h src/contact.h src/log.c src/preferences.h \
 	src/autocomplete.h src/ui_titlebar.c src/ui_windows.c src/common.c \
 	src/contact_list.c src/ui_inputwin.c src/log.h src/profanity.c \
-	src/history.c src/ui.h src/common.h src/ contact_list.h src/xmpp_conn.c \
-	src/main.c src/profanity.h src/history.h  src/xmpp_presence.c \
-	src/tinyurl.c src/tinyurl.h src/chat_session.c \
-	src/chat_session.h src/muc.c src/xmpp_message.c \
-	src/muc.h src/xmpp_stanza.c src/command_parser.c \
-	src/theme.c src/theme.h src/window.c src/window.h \
-	src/files.c src/files.h src/accounts.c src/accounts.h \
-	src/jid.h src/jid.c src/xmpp_caps.c src/xmpp_iq.c
+	src/history.c src/ui.h src/common.h src/ contact_list.h \
+	src/main.c src/profanity.h src/history.h src/tinyurl.c src/tinyurl.h \
+	src/chat_session.c src/chat_session.h src/muc.c src/muc.h \
+	src/command_parser.c src/theme.c src/theme.h src/window.c src/window.h \
+	src/files.c src/files.h src/accounts.c src/accounts.h src/jid.h src/jid.c \
+	src/xmpp/xmpp.h src/xmpp/capabilities.c src/xmpp/connection.c \
+	src/xmpp/iq.c src/xmpp/message.c src/xmpp/presence.c src/xmpp/stanza.c
 
 TESTS = tests/testsuite
 check_PROGRAMS = tests/testsuite
diff --git a/src/accounts.c b/src/accounts.c
index f5d46b82..5feeab92 100644
--- a/src/accounts.c
+++ b/src/accounts.c
@@ -31,7 +31,7 @@
 #include "files.h"
 #include "jid.h"
 #include "log.h"
-#include "xmpp.h"
+#include "xmpp/xmpp.h"
 
 static gchar *accounts_loc;
 static GKeyFile *accounts;
diff --git a/src/command.c b/src/command.c
index 0c5be094..2737c22a 100644
--- a/src/command.c
+++ b/src/command.c
@@ -42,7 +42,7 @@
 #include "theme.h"
 #include "tinyurl.h"
 #include "ui.h"
-#include "xmpp.h"
+#include "xmpp/xmpp.h"
 
 typedef char*(*autocomplete_func)(char *);
 
diff --git a/src/profanity.c b/src/profanity.c
index f3fb2bfc..2cb028f7 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -42,7 +42,7 @@
 #include "muc.h"
 #include "theme.h"
 #include "ui.h"
-#include "xmpp.h"
+#include "xmpp/xmpp.h"
 
 static log_level_t _get_log_level(char *log_level);
 static gboolean _process_input(char *inp);
diff --git a/src/profanity.h b/src/profanity.h
index d971f1cc..8cbec501 100644
--- a/src/profanity.h
+++ b/src/profanity.h
@@ -23,7 +23,7 @@
 #ifndef PROFANITY_H
 #define PROFANITY_H
 
-#include "xmpp.h"
+#include "xmpp/xmpp.h"
 
 void prof_run(const int disable_tls, char *log_level);
 
diff --git a/src/ui.h b/src/ui.h
index 2d58f755..7599d374 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -36,8 +36,8 @@
 #endif
 
 #include "contact.h"
-#include "xmpp.h"
 #include "jid.h"
+#include "xmpp/xmpp.h"
 
 #define INP_WIN_MAX 1000
 #define PAD_SIZE 1000
diff --git a/src/xmpp_caps.c b/src/xmpp/capabilities.c
similarity index 99%
rename from src/xmpp_caps.c
rename to src/xmpp/capabilities.c
index 2bf84f1f..7b3e06e5 100644
--- a/src/xmpp_caps.c
+++ b/src/xmpp/capabilities.c
@@ -1,5 +1,5 @@
 /*
- * xmpp_caps.c
+ * capabilities.c
  *
  * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
  *
diff --git a/src/xmpp_conn.c b/src/xmpp/connection.c
similarity index 99%
rename from src/xmpp_conn.c
rename to src/xmpp/connection.c
index 3e973ccb..3fdfd1c6 100644
--- a/src/xmpp_conn.c
+++ b/src/xmpp/connection.c
@@ -1,5 +1,5 @@
 /*
- * xmpp_conn.c
+ * connection.c
  *
  * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
  *
diff --git a/src/xmpp_iq.c b/src/xmpp/iq.c
similarity index 99%
rename from src/xmpp_iq.c
rename to src/xmpp/iq.c
index 1b3a3f25..267a31c7 100644
--- a/src/xmpp_iq.c
+++ b/src/xmpp/iq.c
@@ -1,5 +1,5 @@
 /*
- * xmpp_iq.c
+ * iq.c
  *
  * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
  *
diff --git a/src/xmpp_message.c b/src/xmpp/message.c
similarity index 99%
rename from src/xmpp_message.c
rename to src/xmpp/message.c
index c75df16a..cf5b552e 100644
--- a/src/xmpp_message.c
+++ b/src/xmpp/message.c
@@ -1,5 +1,5 @@
 /*
- * xmpp_message.c
+ * message.c
  *
  * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
  *
diff --git a/src/xmpp_presence.c b/src/xmpp/presence.c
similarity index 99%
rename from src/xmpp_presence.c
rename to src/xmpp/presence.c
index 745389a6..b29b9122 100644
--- a/src/xmpp_presence.c
+++ b/src/xmpp/presence.c
@@ -1,5 +1,5 @@
 /*
- * xmpp_presence.c
+ * presence.c
  *
  * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
  *
diff --git a/src/xmpp_stanza.c b/src/xmpp/stanza.c
similarity index 99%
rename from src/xmpp_stanza.c
rename to src/xmpp/stanza.c
index 3eda99df..90501ffe 100644
--- a/src/xmpp_stanza.c
+++ b/src/xmpp/stanza.c
@@ -1,5 +1,5 @@
 /*
- * xmpp_stanza.c
+ * stanza.c
  *
  * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
  *
diff --git a/src/xmpp.h b/src/xmpp/xmpp.h
similarity index 100%
rename from src/xmpp.h
rename to src/xmpp/xmpp.h