diff --git a/COPYING b/nwipe/COPYING
similarity index 100%
rename from COPYING
rename to nwipe/COPYING
diff --git a/Makefile.am b/nwipe/Makefile.am
similarity index 100%
rename from Makefile.am
rename to nwipe/Makefile.am
diff --git a/README b/nwipe/README
similarity index 100%
rename from README
rename to nwipe/README
diff --git a/README.md b/nwipe/README.md
similarity index 100%
rename from README.md
rename to nwipe/README.md
diff --git a/configure.ac b/nwipe/configure.ac
similarity index 100%
rename from configure.ac
rename to nwipe/configure.ac
diff --git a/init.sh b/nwipe/init.sh
similarity index 100%
rename from init.sh
rename to nwipe/init.sh
diff --git a/man/Makefile.am b/nwipe/man/Makefile.am
similarity index 100%
rename from man/Makefile.am
rename to nwipe/man/Makefile.am
diff --git a/man/nwipe.1 b/nwipe/man/nwipe.1
similarity index 100%
rename from man/nwipe.1
rename to nwipe/man/nwipe.1
diff --git a/src/Makefile.am b/nwipe/src/Makefile.am
similarity index 100%
rename from src/Makefile.am
rename to nwipe/src/Makefile.am
diff --git a/src/context.h b/nwipe/src/context.h
similarity index 100%
rename from src/context.h
rename to nwipe/src/context.h
diff --git a/src/device.c b/nwipe/src/device.c
similarity index 99%
rename from src/device.c
rename to nwipe/src/device.c
index b9c15ab..68ab49e 100644
--- a/src/device.c
+++ b/nwipe/src/device.c
@@ -27,7 +27,6 @@
 #include "logging.h"
 
 #include <parted/parted.h>
-#include <parted/debug.h> 
 
 int check_device( nwipe_context_t*** c, PedDevice* dev, int dcount );
 
diff --git a/src/device.h b/nwipe/src/device.h
similarity index 100%
rename from src/device.h
rename to nwipe/src/device.h
diff --git a/src/gui.c b/nwipe/src/gui.c
similarity index 100%
rename from src/gui.c
rename to nwipe/src/gui.c
diff --git a/src/gui.h b/nwipe/src/gui.h
similarity index 100%
rename from src/gui.h
rename to nwipe/src/gui.h
diff --git a/src/isaac_rand.c b/nwipe/src/isaac_rand.c
similarity index 100%
rename from src/isaac_rand.c
rename to nwipe/src/isaac_rand.c
diff --git a/src/isaac_rand.h b/nwipe/src/isaac_rand.h
similarity index 100%
rename from src/isaac_rand.h
rename to nwipe/src/isaac_rand.h
diff --git a/src/isaac_standard.h b/nwipe/src/isaac_standard.h
similarity index 100%
rename from src/isaac_standard.h
rename to nwipe/src/isaac_standard.h
diff --git a/src/logging.c b/nwipe/src/logging.c
similarity index 99%
rename from src/logging.c
rename to nwipe/src/logging.c
index eba15e1..dbf82a4 100644
--- a/src/logging.c
+++ b/nwipe/src/logging.c
@@ -50,7 +50,7 @@ void nwipe_log( nwipe_log_t level, const char* format, ... )
 
 	/* Get the current time. */
 	t = time( NULL );
-	p = gmtime( &t );
+	p = localtime( &t );
 
 	pthread_mutex_lock( &mutex1 );
 
diff --git a/src/logging.h b/nwipe/src/logging.h
similarity index 100%
rename from src/logging.h
rename to nwipe/src/logging.h
diff --git a/src/method.c b/nwipe/src/method.c
similarity index 100%
rename from src/method.c
rename to nwipe/src/method.c
diff --git a/src/method.h b/nwipe/src/method.h
similarity index 100%
rename from src/method.h
rename to nwipe/src/method.h
diff --git a/src/mt19937ar-cok.c b/nwipe/src/mt19937ar-cok.c
similarity index 100%
rename from src/mt19937ar-cok.c
rename to nwipe/src/mt19937ar-cok.c
diff --git a/src/mt19937ar-cok.h b/nwipe/src/mt19937ar-cok.h
similarity index 100%
rename from src/mt19937ar-cok.h
rename to nwipe/src/mt19937ar-cok.h
diff --git a/src/nwipe.c b/nwipe/src/nwipe.c
similarity index 99%
rename from src/nwipe.c
rename to nwipe/src/nwipe.c
index b0e89f2..3ec8131 100644
--- a/src/nwipe.c
+++ b/nwipe/src/nwipe.c
@@ -23,6 +23,9 @@
 
 #include <time.h>
 #include <signal.h>
+#include <sys/shm.h>
+#include <wait.h>
+#include <parted/parted.h>
 
 #include "nwipe.h"
 #include "context.h"
@@ -34,13 +37,6 @@
 #include "gui.h"
 
 
-#include <sys/ioctl.h>  /* FIXME: Twice Included */
-#include <sys/shm.h>
-#include <wait.h>
-
-#include <parted/parted.h>
-#include <parted/debug.h>
-
 int main( int argc, char** argv )
 {
         int nwipe_optind;              /* The result of nwipe_options().                    */
diff --git a/src/nwipe.h b/nwipe/src/nwipe.h
similarity index 100%
rename from src/nwipe.h
rename to nwipe/src/nwipe.h
diff --git a/src/options.c b/nwipe/src/options.c
similarity index 100%
rename from src/options.c
rename to nwipe/src/options.c
diff --git a/src/options.h b/nwipe/src/options.h
similarity index 100%
rename from src/options.h
rename to nwipe/src/options.h
diff --git a/src/pass.c b/nwipe/src/pass.c
similarity index 100%
rename from src/pass.c
rename to nwipe/src/pass.c
diff --git a/src/pass.h b/nwipe/src/pass.h
similarity index 100%
rename from src/pass.h
rename to nwipe/src/pass.h
diff --git a/src/prng.c b/nwipe/src/prng.c
similarity index 100%
rename from src/prng.c
rename to nwipe/src/prng.c
diff --git a/src/prng.h b/nwipe/src/prng.h
similarity index 100%
rename from src/prng.h
rename to nwipe/src/prng.h
diff --git a/src/version.c b/nwipe/src/version.c
similarity index 64%
rename from src/version.c
rename to nwipe/src/version.c
index 360c812..706e41a 100644
--- a/src/version.c
+++ b/nwipe/src/version.c
@@ -4,23 +4,7 @@
  * used by configure to dynamically assign those values 
  * to documentation files.
  */
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-const char *version_string = "0.20";
-=======
-const char *version_string = "0.18";
->>>>>>> parent of 263d5d1... bump version to 0.19
-=======
 const char *version_string = "0.22";
->>>>>>> e7d9ff73fe76e9fcc04847eba2806bd0904f0499
-=======
-const char *version_string = "0.20";
->>>>>>> parent of b808b84... Revert "bump version to 0.19"
-=======
-const char *version_string = "0.22";
->>>>>>> 464bf788c534bf67a1d7290f2175dcf925f5f9ed
 const char *program_name   = "nwipe";
 const char *author_name    = "Martijn van Brummelen";
 const char *email_address  = "git@brumit.nl";
diff --git a/src/version.h b/nwipe/src/version.h
similarity index 100%
rename from src/version.h
rename to nwipe/src/version.h