diff --git a/test3.c b/test3.c
deleted file mode 100644
index 30e5fee..0000000
--- a/test3.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "bigpoint_cclass.h"
-#include "bigpoint_dyntype.h"
-
-
-int
-main(int argc, char * argv[])
-{
-    char  string[] = "ein weiterer test";
-    int   integer  = 42;
-    float floating = 4.3;
-
-    char * rstring = NULL;
-    long   rint    = 0;
-    double rfloat  = 0.0;
-
-    struct BIGPOINT_DYNTYPE * dynstring = 
-        new(BIGPOINT_DYNTYPE, BIGPOINT_DYNTYPE_STRING, strlen(string) + 1, string);
-    struct BIGPOINT_DYNTYPE * dynint = 
-        new(BIGPOINT_DYNTYPE, BIGPOINT_DYNTYPE_INT, sizeof(long), (long)integer);
-    struct BIGPOINT_DYNTYPE * dynfloat = 
-        new(BIGPOINT_DYNTYPE, BIGPOINT_DYNTYPE_FLOAT, sizeof(double), (double)floating);
-    
-    bigpoint_dyntype_get(dynstring, rstring);
-    bigpoint_dyntype_get(dynint, rint);
-    bigpoint_dyntype_get(dynfloat, rfloat);
-
-    printf("%s\n",  rstring);
-    printf("%ld\n", rint);
-    printf("%lf\n", rfloat);
-
-    delete(dynstring);
-    delete(dynint);
-    delete(dynfloat);
-
-    return 0;
-}
-
-// vim: set et ts=4 sw=4:
diff --git a/test2.c b/tests/crypt_test.c
similarity index 100%
rename from test2.c
rename to tests/crypt_test.c
diff --git a/test.c b/tests/decrypt_test.c
similarity index 100%
rename from test.c
rename to tests/decrypt_test.c
diff --git a/test4.c b/tests/dyntype_test.c
similarity index 100%
rename from test4.c
rename to tests/dyntype_test.c