diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff7bbc70..82203c26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,5 +21,5 @@ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set (VALA_CFLAGS -Wno-deprecated-declarations -Wno-incompatible-pointer-types -Wno-int-conversion)
 
 add_subdirectory(qlite)
-add_subdirectory(vala-xmpp)
+add_subdirectory(xmpp-vala)
 add_subdirectory(client)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 1ce8c1ee..574d603e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -1,6 +1,5 @@
 find_package(Vala REQUIRED)
 find_package(PkgConfig REQUIRED)
-find_package(GPGME REQUIRED)
 include(${VALA_USE_FILE})
 include(GlibCompileResourcesSupport)
 
@@ -125,8 +124,7 @@ SOURCES
     src/ui/util.vala
 PACKAGES
     ${CLIENT_PACKAGES}
-    gpgme
-    vala-xmpp
+    xmpp-vala
     qlite
 GRESOURCES
     ${CLIENT_GRESOURCES_XML}
@@ -134,15 +132,15 @@ OPTIONS
     --target-glib=2.38
     -g
     --thread
-    --vapidir=${CMAKE_BINARY_DIR}/vala-xmpp
+    --vapidir=${CMAKE_BINARY_DIR}/xmpp-vala
     --vapidir=${CMAKE_BINARY_DIR}/qlite
     --vapidir=${CMAKE_SOURCE_DIR}/vapi
 
 )
 
-set(CFLAGS ${CLIENT_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS} -g -I${CMAKE_BINARY_DIR}/vala-xmpp -I${CMAKE_BINARY_DIR}/qlite ${VALA_CFLAGS})
+set(CFLAGS ${CLIENT_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS} -g -I${CMAKE_BINARY_DIR}/xmpp-vala -I${CMAKE_BINARY_DIR}/qlite ${VALA_CFLAGS})
 add_definitions(${CFLAGS})
 add_executable(dino ${CLIENT_VALA_C} ${CLIENT_GRESOURCES_TARGET})
-add_dependencies(dino vala-xmpp-vapi qlite-vapi)
-target_link_libraries(dino vala-xmpp qlite ${CLIENT_LIBRARIES} ${GPGME_LIBRARIES} ${LIBUUID_LIBRARIES} -lm)
+add_dependencies(dino xmpp-vala-vapi qlite-vapi)
+target_link_libraries(dino xmpp-vala qlite ${CLIENT_LIBRARIES} ${GPGME_LIBRARIES} ${LIBUUID_LIBRARIES} -lm)
 
diff --git a/vala-xmpp/CMakeLists.txt b/xmpp-vala/CMakeLists.txt
similarity index 92%
rename from vala-xmpp/CMakeLists.txt
rename to xmpp-vala/CMakeLists.txt
index e7be66ae..dd846c24 100644
--- a/vala-xmpp/CMakeLists.txt
+++ b/xmpp-vala/CMakeLists.txt
@@ -70,9 +70,9 @@ PACKAGES
     ${ENGINE_PACKAGES}
     gpgme
 GENERATE_VAPI
-    vala-xmpp
+    xmpp-vala
 GENERATE_HEADER
-    vala-xmpp
+    xmpp-vala
 OPTIONS
     --target-glib=2.38
     -g
@@ -82,11 +82,11 @@ OPTIONS
 
 set(CFLAGS ${ENGINE_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS} -g ${VALA_CFLAGS})
 add_definitions(${CFLAGS})
-add_library(vala-xmpp SHARED ${ENGINE_VALA_C})
-target_link_libraries(vala-xmpp ${ENGINE_LIBRARIES} ${GPGME_LIBRARIES} ${LIBUUID_LIBRARIES})
+add_library(xmpp-vala SHARED ${ENGINE_VALA_C})
+target_link_libraries(xmpp-vala ${ENGINE_LIBRARIES} ${GPGME_LIBRARIES} ${LIBUUID_LIBRARIES})
 
-add_custom_target(vala-xmpp-vapi
+add_custom_target(xmpp-vala-vapi
 DEPENDS
-    ${CMAKE_BINARY_DIR}/vala-xmpp/vala-xmpp.vapi
+    ${CMAKE_BINARY_DIR}/xmpp-vala/xmpp-vala.vapi
 )
 
diff --git a/vala-xmpp/src/core/namespace_state.vala b/xmpp-vala/src/core/namespace_state.vala
similarity index 100%
rename from vala-xmpp/src/core/namespace_state.vala
rename to xmpp-vala/src/core/namespace_state.vala
diff --git a/vala-xmpp/src/core/stanza_attribute.vala b/xmpp-vala/src/core/stanza_attribute.vala
similarity index 100%
rename from vala-xmpp/src/core/stanza_attribute.vala
rename to xmpp-vala/src/core/stanza_attribute.vala
diff --git a/vala-xmpp/src/core/stanza_node.vala b/xmpp-vala/src/core/stanza_node.vala
similarity index 100%
rename from vala-xmpp/src/core/stanza_node.vala
rename to xmpp-vala/src/core/stanza_node.vala
diff --git a/vala-xmpp/src/core/stanza_reader.vala b/xmpp-vala/src/core/stanza_reader.vala
similarity index 100%
rename from vala-xmpp/src/core/stanza_reader.vala
rename to xmpp-vala/src/core/stanza_reader.vala
diff --git a/vala-xmpp/src/core/stanza_writer.vala b/xmpp-vala/src/core/stanza_writer.vala
similarity index 100%
rename from vala-xmpp/src/core/stanza_writer.vala
rename to xmpp-vala/src/core/stanza_writer.vala
diff --git a/vala-xmpp/src/core/xmpp_stream.vala b/xmpp-vala/src/core/xmpp_stream.vala
similarity index 100%
rename from vala-xmpp/src/core/xmpp_stream.vala
rename to xmpp-vala/src/core/xmpp_stream.vala
diff --git a/vala-xmpp/src/module/bind.vala b/xmpp-vala/src/module/bind.vala
similarity index 100%
rename from vala-xmpp/src/module/bind.vala
rename to xmpp-vala/src/module/bind.vala
diff --git a/vala-xmpp/src/module/iq/module.vala b/xmpp-vala/src/module/iq/module.vala
similarity index 100%
rename from vala-xmpp/src/module/iq/module.vala
rename to xmpp-vala/src/module/iq/module.vala
diff --git a/vala-xmpp/src/module/iq/stanza.vala b/xmpp-vala/src/module/iq/stanza.vala
similarity index 100%
rename from vala-xmpp/src/module/iq/stanza.vala
rename to xmpp-vala/src/module/iq/stanza.vala
diff --git a/vala-xmpp/src/module/message/module.vala b/xmpp-vala/src/module/message/module.vala
similarity index 100%
rename from vala-xmpp/src/module/message/module.vala
rename to xmpp-vala/src/module/message/module.vala
diff --git a/vala-xmpp/src/module/message/stanza.vala b/xmpp-vala/src/module/message/stanza.vala
similarity index 100%
rename from vala-xmpp/src/module/message/stanza.vala
rename to xmpp-vala/src/module/message/stanza.vala
diff --git a/vala-xmpp/src/module/presence/flag.vala b/xmpp-vala/src/module/presence/flag.vala
similarity index 100%
rename from vala-xmpp/src/module/presence/flag.vala
rename to xmpp-vala/src/module/presence/flag.vala
diff --git a/vala-xmpp/src/module/presence/module.vala b/xmpp-vala/src/module/presence/module.vala
similarity index 100%
rename from vala-xmpp/src/module/presence/module.vala
rename to xmpp-vala/src/module/presence/module.vala
diff --git a/vala-xmpp/src/module/presence/stanza.vala b/xmpp-vala/src/module/presence/stanza.vala
similarity index 100%
rename from vala-xmpp/src/module/presence/stanza.vala
rename to xmpp-vala/src/module/presence/stanza.vala
diff --git a/vala-xmpp/src/module/roster/flag.vala b/xmpp-vala/src/module/roster/flag.vala
similarity index 100%
rename from vala-xmpp/src/module/roster/flag.vala
rename to xmpp-vala/src/module/roster/flag.vala
diff --git a/vala-xmpp/src/module/roster/item.vala b/xmpp-vala/src/module/roster/item.vala
similarity index 100%
rename from vala-xmpp/src/module/roster/item.vala
rename to xmpp-vala/src/module/roster/item.vala
diff --git a/vala-xmpp/src/module/roster/module.vala b/xmpp-vala/src/module/roster/module.vala
similarity index 100%
rename from vala-xmpp/src/module/roster/module.vala
rename to xmpp-vala/src/module/roster/module.vala
diff --git a/vala-xmpp/src/module/sasl.vala b/xmpp-vala/src/module/sasl.vala
similarity index 100%
rename from vala-xmpp/src/module/sasl.vala
rename to xmpp-vala/src/module/sasl.vala
diff --git a/vala-xmpp/src/module/stanza.vala b/xmpp-vala/src/module/stanza.vala
similarity index 100%
rename from vala-xmpp/src/module/stanza.vala
rename to xmpp-vala/src/module/stanza.vala
diff --git a/vala-xmpp/src/module/stanza_error.vala b/xmpp-vala/src/module/stanza_error.vala
similarity index 100%
rename from vala-xmpp/src/module/stanza_error.vala
rename to xmpp-vala/src/module/stanza_error.vala
diff --git a/vala-xmpp/src/module/stream_error.vala b/xmpp-vala/src/module/stream_error.vala
similarity index 100%
rename from vala-xmpp/src/module/stream_error.vala
rename to xmpp-vala/src/module/stream_error.vala
diff --git a/vala-xmpp/src/module/tls.vala b/xmpp-vala/src/module/tls.vala
similarity index 100%
rename from vala-xmpp/src/module/tls.vala
rename to xmpp-vala/src/module/tls.vala
diff --git a/vala-xmpp/src/module/util.vala b/xmpp-vala/src/module/util.vala
similarity index 100%
rename from vala-xmpp/src/module/util.vala
rename to xmpp-vala/src/module/util.vala
diff --git a/vala-xmpp/src/module/xep/0027_pgp/flag.vala b/xmpp-vala/src/module/xep/0027_pgp/flag.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0027_pgp/flag.vala
rename to xmpp-vala/src/module/xep/0027_pgp/flag.vala
diff --git a/vala-xmpp/src/module/xep/0027_pgp/module.vala b/xmpp-vala/src/module/xep/0027_pgp/module.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0027_pgp/module.vala
rename to xmpp-vala/src/module/xep/0027_pgp/module.vala
diff --git a/vala-xmpp/src/module/xep/0030_service_discovery/flag.vala b/xmpp-vala/src/module/xep/0030_service_discovery/flag.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0030_service_discovery/flag.vala
rename to xmpp-vala/src/module/xep/0030_service_discovery/flag.vala
diff --git a/vala-xmpp/src/module/xep/0030_service_discovery/info_result.vala b/xmpp-vala/src/module/xep/0030_service_discovery/info_result.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0030_service_discovery/info_result.vala
rename to xmpp-vala/src/module/xep/0030_service_discovery/info_result.vala
diff --git a/vala-xmpp/src/module/xep/0030_service_discovery/items_result.vala b/xmpp-vala/src/module/xep/0030_service_discovery/items_result.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0030_service_discovery/items_result.vala
rename to xmpp-vala/src/module/xep/0030_service_discovery/items_result.vala
diff --git a/vala-xmpp/src/module/xep/0030_service_discovery/module.vala b/xmpp-vala/src/module/xep/0030_service_discovery/module.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0030_service_discovery/module.vala
rename to xmpp-vala/src/module/xep/0030_service_discovery/module.vala
diff --git a/vala-xmpp/src/module/xep/0045_muc/flag.vala b/xmpp-vala/src/module/xep/0045_muc/flag.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0045_muc/flag.vala
rename to xmpp-vala/src/module/xep/0045_muc/flag.vala
diff --git a/vala-xmpp/src/module/xep/0045_muc/module.vala b/xmpp-vala/src/module/xep/0045_muc/module.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0045_muc/module.vala
rename to xmpp-vala/src/module/xep/0045_muc/module.vala
diff --git a/vala-xmpp/src/module/xep/0048_bookmarks/conference.vala b/xmpp-vala/src/module/xep/0048_bookmarks/conference.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0048_bookmarks/conference.vala
rename to xmpp-vala/src/module/xep/0048_bookmarks/conference.vala
diff --git a/vala-xmpp/src/module/xep/0048_bookmarks/module.vala b/xmpp-vala/src/module/xep/0048_bookmarks/module.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0048_bookmarks/module.vala
rename to xmpp-vala/src/module/xep/0048_bookmarks/module.vala
diff --git a/vala-xmpp/src/module/xep/0049_private_xml_storage.vala b/xmpp-vala/src/module/xep/0049_private_xml_storage.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0049_private_xml_storage.vala
rename to xmpp-vala/src/module/xep/0049_private_xml_storage.vala
diff --git a/vala-xmpp/src/module/xep/0054_vcard/module.vala b/xmpp-vala/src/module/xep/0054_vcard/module.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0054_vcard/module.vala
rename to xmpp-vala/src/module/xep/0054_vcard/module.vala
diff --git a/vala-xmpp/src/module/xep/0060_pubsub.vala b/xmpp-vala/src/module/xep/0060_pubsub.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0060_pubsub.vala
rename to xmpp-vala/src/module/xep/0060_pubsub.vala
diff --git a/vala-xmpp/src/module/xep/0082_date_time_profiles.vala b/xmpp-vala/src/module/xep/0082_date_time_profiles.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0082_date_time_profiles.vala
rename to xmpp-vala/src/module/xep/0082_date_time_profiles.vala
diff --git a/vala-xmpp/src/module/xep/0084_user_avatars.vala b/xmpp-vala/src/module/xep/0084_user_avatars.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0084_user_avatars.vala
rename to xmpp-vala/src/module/xep/0084_user_avatars.vala
diff --git a/vala-xmpp/src/module/xep/0085_chat_state_notifications.vala b/xmpp-vala/src/module/xep/0085_chat_state_notifications.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0085_chat_state_notifications.vala
rename to xmpp-vala/src/module/xep/0085_chat_state_notifications.vala
diff --git a/vala-xmpp/src/module/xep/0115_entitiy_capabilities.vala b/xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0115_entitiy_capabilities.vala
rename to xmpp-vala/src/module/xep/0115_entitiy_capabilities.vala
diff --git a/vala-xmpp/src/module/xep/0184_message_delivery_receipts.vala b/xmpp-vala/src/module/xep/0184_message_delivery_receipts.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0184_message_delivery_receipts.vala
rename to xmpp-vala/src/module/xep/0184_message_delivery_receipts.vala
diff --git a/vala-xmpp/src/module/xep/0199_ping.vala b/xmpp-vala/src/module/xep/0199_ping.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0199_ping.vala
rename to xmpp-vala/src/module/xep/0199_ping.vala
diff --git a/vala-xmpp/src/module/xep/0203_delayed_delivery.vala b/xmpp-vala/src/module/xep/0203_delayed_delivery.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0203_delayed_delivery.vala
rename to xmpp-vala/src/module/xep/0203_delayed_delivery.vala
diff --git a/vala-xmpp/src/module/xep/0280_message_carbons.vala b/xmpp-vala/src/module/xep/0280_message_carbons.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0280_message_carbons.vala
rename to xmpp-vala/src/module/xep/0280_message_carbons.vala
diff --git a/vala-xmpp/src/module/xep/0333_chat_markers.vala b/xmpp-vala/src/module/xep/0333_chat_markers.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/0333_chat_markers.vala
rename to xmpp-vala/src/module/xep/0333_chat_markers.vala
diff --git a/vala-xmpp/src/module/xep/pixbuf_storage.vala b/xmpp-vala/src/module/xep/pixbuf_storage.vala
similarity index 100%
rename from vala-xmpp/src/module/xep/pixbuf_storage.vala
rename to xmpp-vala/src/module/xep/pixbuf_storage.vala
diff --git a/vala-xmpp/vapi/uuid.vapi b/xmpp-vala/vapi/uuid.vapi
similarity index 100%
rename from vala-xmpp/vapi/uuid.vapi
rename to xmpp-vala/vapi/uuid.vapi