50 files changed, 12 insertions, 14 deletions
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
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
index e71607fa..e71607fa 100644
--- a/vala-xmpp/src/core/namespace_state.vala
+++ b/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
index 3169e90e..3169e90e 100644
--- a/vala-xmpp/src/core/stanza_attribute.vala
+++ b/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
index 1dfacfdd..1dfacfdd 100644
--- a/vala-xmpp/src/core/stanza_node.vala
+++ b/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
index 0a90f855..0a90f855 100644
--- a/vala-xmpp/src/core/stanza_reader.vala
+++ b/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
index 26524d7b..26524d7b 100644
--- a/vala-xmpp/src/core/stanza_writer.vala
+++ b/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
index e30a1c9b..e30a1c9b 100644
--- a/vala-xmpp/src/core/xmpp_stream.vala
+++ b/xmpp-vala/src/core/xmpp_stream.vala
diff --git a/vala-xmpp/src/module/bind.vala b/xmpp-vala/src/module/bind.vala
index d01fda7a..d01fda7a 100644
--- a/vala-xmpp/src/module/bind.vala
+++ b/xmpp-vala/src/module/bind.vala
diff --git a/vala-xmpp/src/module/iq/module.vala b/xmpp-vala/src/module/iq/module.vala
index b5c50bd7..b5c50bd7 100644
--- a/vala-xmpp/src/module/iq/module.vala
+++ b/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
index 561c5866..561c5866 100644
--- a/vala-xmpp/src/module/iq/stanza.vala
+++ b/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
index 10d83693..10d83693 100644
--- a/vala-xmpp/src/module/message/module.vala
+++ b/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
index 8a9064a5..8a9064a5 100644
--- a/vala-xmpp/src/module/message/stanza.vala
+++ b/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
index a92c9405..a92c9405 100644
--- a/vala-xmpp/src/module/presence/flag.vala
+++ b/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
index 6c9d183c..6c9d183c 100644
--- a/vala-xmpp/src/module/presence/module.vala
+++ b/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
index 9ad8f791..9ad8f791 100644
--- a/vala-xmpp/src/module/presence/stanza.vala
+++ b/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
index c3e35158..c3e35158 100644
--- a/vala-xmpp/src/module/roster/flag.vala
+++ b/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
index 7ef76fd4..7ef76fd4 100644
--- a/vala-xmpp/src/module/roster/item.vala
+++ b/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
index c8b09710..c8b09710 100644
--- a/vala-xmpp/src/module/roster/module.vala
+++ b/xmpp-vala/src/module/roster/module.vala
diff --git a/vala-xmpp/src/module/sasl.vala b/xmpp-vala/src/module/sasl.vala
index 07e3f5c4..07e3f5c4 100644
--- a/vala-xmpp/src/module/sasl.vala
+++ b/xmpp-vala/src/module/sasl.vala
diff --git a/vala-xmpp/src/module/stanza.vala b/xmpp-vala/src/module/stanza.vala
index f6af9623..f6af9623 100644
--- a/vala-xmpp/src/module/stanza.vala
+++ b/xmpp-vala/src/module/stanza.vala
diff --git a/vala-xmpp/src/module/stanza_error.vala b/xmpp-vala/src/module/stanza_error.vala
index be4633e9..be4633e9 100644
--- a/vala-xmpp/src/module/stanza_error.vala
+++ b/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
index 73e2bb36..73e2bb36 100644
--- a/vala-xmpp/src/module/stream_error.vala
+++ b/xmpp-vala/src/module/stream_error.vala
diff --git a/vala-xmpp/src/module/tls.vala b/xmpp-vala/src/module/tls.vala
index 1f8447ec..1f8447ec 100644
--- a/vala-xmpp/src/module/tls.vala
+++ b/xmpp-vala/src/module/tls.vala
diff --git a/vala-xmpp/src/module/util.vala b/xmpp-vala/src/module/util.vala
index 65a9b261..65a9b261 100644
--- a/vala-xmpp/src/module/util.vala
+++ b/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
index 03844afa..03844afa 100644
--- a/vala-xmpp/src/module/xep/0027_pgp/flag.vala
+++ b/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
index fee6b9e4..fee6b9e4 100644
--- a/vala-xmpp/src/module/xep/0027_pgp/module.vala
+++ b/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
index 5be9f2eb..5be9f2eb 100644
--- a/vala-xmpp/src/module/xep/0030_service_discovery/flag.vala
+++ b/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
index 7e0f0ea4..7e0f0ea4 100644
--- a/vala-xmpp/src/module/xep/0030_service_discovery/info_result.vala
+++ b/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
index 2c29c320..2c29c320 100644
--- a/vala-xmpp/src/module/xep/0030_service_discovery/items_result.vala
+++ b/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
index 109da897..109da897 100644
--- a/vala-xmpp/src/module/xep/0030_service_discovery/module.vala
+++ b/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
index 6c1ef508..6c1ef508 100644
--- a/vala-xmpp/src/module/xep/0045_muc/flag.vala
+++ b/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
index f9ed9539..f9ed9539 100644
--- a/vala-xmpp/src/module/xep/0045_muc/module.vala
+++ b/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
index 818ab3d0..818ab3d0 100644
--- a/vala-xmpp/src/module/xep/0048_bookmarks/conference.vala
+++ b/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
index d7767208..d7767208 100644
--- a/vala-xmpp/src/module/xep/0048_bookmarks/module.vala
+++ b/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
index c57acdde..c57acdde 100644
--- a/vala-xmpp/src/module/xep/0049_private_xml_storage.vala
+++ b/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
index 58b71d2c..58b71d2c 100644
--- a/vala-xmpp/src/module/xep/0054_vcard/module.vala
+++ b/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
index 3f96e7a1..3f96e7a1 100644
--- a/vala-xmpp/src/module/xep/0060_pubsub.vala
+++ b/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
index b2ce1077..b2ce1077 100644
--- a/vala-xmpp/src/module/xep/0082_date_time_profiles.vala
+++ b/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
index 13d19674..13d19674 100644
--- a/vala-xmpp/src/module/xep/0084_user_avatars.vala
+++ b/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
index cefc7a18..cefc7a18 100644
--- a/vala-xmpp/src/module/xep/0085_chat_state_notifications.vala
+++ b/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
index 472eb9bd..472eb9bd 100644
--- a/vala-xmpp/src/module/xep/0115_entitiy_capabilities.vala
+++ b/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
index 489592fa..489592fa 100644
--- a/vala-xmpp/src/module/xep/0184_message_delivery_receipts.vala
+++ b/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
index 82da1d23..82da1d23 100644
--- a/vala-xmpp/src/module/xep/0199_ping.vala
+++ b/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
index 9f9761f2..9f9761f2 100644
--- a/vala-xmpp/src/module/xep/0203_delayed_delivery.vala
+++ b/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
index 18b2ecdf..18b2ecdf 100644
--- a/vala-xmpp/src/module/xep/0280_message_carbons.vala
+++ b/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
index 0dc0e637..0dc0e637 100644
--- a/vala-xmpp/src/module/xep/0333_chat_markers.vala
+++ b/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
index 0caf4924..0caf4924 100644
--- a/vala-xmpp/src/module/xep/pixbuf_storage.vala
+++ b/xmpp-vala/src/module/xep/pixbuf_storage.vala
diff --git a/vala-xmpp/vapi/uuid.vapi b/xmpp-vala/vapi/uuid.vapi
index 991917a7..991917a7 100644
--- a/vala-xmpp/vapi/uuid.vapi
+++ b/xmpp-vala/vapi/uuid.vapi