diff --git a/src/Makefile.subdir b/src/Makefile.subdir
index 9dbb1c30add20066ee23efa3d5546a5263bea23d..a4b3706d46d60811d9aca2d14e9cf74aa74a2130 100644
--- a/src/Makefile.subdir
+++ b/src/Makefile.subdir
@@ -1,5 +1,5 @@
 noinst_HEADERS += \
-  src/aio/completion.h \
+  src/client/aio/completion.h \
   src/client/io-context.h \
   src/client/cluster-handle.h \
   src/io-chain/args-read-actions.h \
@@ -46,7 +46,7 @@ src_io_chain_libio_chain_la_SOURCES = src/io-chain/prepare-read-op.c \
 
 
 src_client_libmobject_store_la_SOURCES = \
-  src/aio/completion.c \
+  src/client/aio/completion.c \
   src/client/io-context.c \
   src/client/read-op.c \
   src/client/write-op.c \
diff --git a/src/aio/completion.c b/src/client/aio/completion.c
similarity index 98%
rename from src/aio/completion.c
rename to src/client/aio/completion.c
index f74906e02a5ff60e79026da9a776e48dfd57fc3a..5e9265552eb0db27ffd436b512d775d70e083127 100644
--- a/src/aio/completion.c
+++ b/src/client/aio/completion.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include "mobject-store-config.h"
 #include "libmobject-store.h"
-#include "src/aio/completion.h"
+#include "src/client/aio/completion.h"
 #include "src/util/log.h"
 
 int mobject_store_aio_create_completion(void *cb_arg,
diff --git a/src/aio/completion.h b/src/client/aio/completion.h
similarity index 100%
rename from src/aio/completion.h
rename to src/client/aio/completion.h
diff --git a/src/client/write-op.c b/src/client/write-op.c
index cafd5efe69590fa49d051b49c100dd5c2812c0f9..044eb16c5d941040062c59594b6195879c7ee5c4 100644
--- a/src/client/write-op.c
+++ b/src/client/write-op.c
@@ -9,7 +9,7 @@
 #include "mobject-store-config.h"
 #include "libmobject-store.h"
 #include "src/io-chain/write-op-impl.h"
-#include "src/aio/completion.h"
+#include "src/client/aio/completion.h"
 #include "src/util/utlist.h"
 #include "src/util/log.h"
 
diff --git a/src/io-chain/write-op-impl.c b/src/io-chain/write-op-impl.c
index 13dfddffbb6404de79896f041b5c9f968ca914e8..3270a60890e83ae5b7d11f266b4369bd07e50964 100644
--- a/src/io-chain/write-op-impl.c
+++ b/src/io-chain/write-op-impl.c
@@ -9,7 +9,6 @@
 #include "mobject-store-config.h"
 #include "libmobject-store.h"
 #include "src/io-chain/write-op-impl.h"
-#include "src/aio/completion.h"
 #include "src/util/utlist.h"
 #include "src/util/log.h"
 
diff --git a/tests/mobject-client-test.c b/tests/mobject-client-test.c
index 22a1e25041392232f80027b2d12b3d188cada9f2..5f0d1042413832207bfb996ef64815b30aa2881e 100644
--- a/tests/mobject-client-test.c
+++ b/tests/mobject-client-test.c
@@ -8,13 +8,9 @@ int main(int argc, char** argv)
 {
     mobject_store_t cluster;
     mobject_store_create(&cluster, "admin");
-
     mobject_store_connect(cluster);
-
     mobject_store_ioctx_t ioctx;
-
     mobject_store_ioctx_create(cluster, "my-object-pool", &ioctx);
-
     char buffer[256];
     unsigned i;
     for(i=0; i<256; i++) buffer[i] = 'A'+(i % 26);
@@ -46,9 +42,9 @@ int main(int argc, char** argv)
         mobject_store_write_op_omap_set(write_op, keys, values, val_sizes, 5);
         // Add a omap_rm_keys" operation
         mobject_store_write_op_omap_rm_keys(write_op, keys, 5);
-
+        fprintf(stderr,"FFF\n");
         mobject_store_write_op_operate(write_op, ioctx, "test-object", NULL, LIBMOBJECT_OPERATION_NOFLAG);
-
+        fprintf(stderr,"GGG\n");
         mobject_store_release_write_op(write_op);
 
     }