diff --git a/nwaku.go b/wakuv2/nwaku.go
similarity index 99%
rename from nwaku.go
rename to wakuv2/nwaku.go
index f69a97a..b78b71d 100644
--- a/nwaku.go
+++ b/wakuv2/nwaku.go
@@ -1,10 +1,10 @@
 package wakuv2
 
 /*
-	#cgo LDFLAGS: -L./third_party/nwaku/build/ -lnegentropy -lwaku
-	#cgo LDFLAGS: -L./third_party/nwaku -Wl,-rpath,../third_party/nwaku/build/
+	#cgo LDFLAGS: -L../third_party/nwaku/build/ -lnegentropy -lwaku
+	#cgo LDFLAGS: -L../third_party/nwaku -Wl,-rpath,../third_party/nwaku/build/
 
-	#include "./third_party/nwaku/library/libwaku.h"
+	#include "../third_party/nwaku/library/libwaku.h"
 	#include <stdio.h>
 	#include <stdlib.h>
 
diff --git a/nwaku_test.go b/wakuv2/nwaku_test.go
similarity index 100%
rename from nwaku_test.go
rename to wakuv2/nwaku_test.go
diff --git a/nwaku_test_utils.go b/wakuv2/nwaku_test_utils.go
similarity index 100%
rename from nwaku_test_utils.go
rename to wakuv2/nwaku_test_utils.go