diff --git a/.gitignore b/.gitignore
index 3a4cf3c..1334267 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,8 @@ node_modules
 package-lock.json
 .idea
 go.sum
+covdata/
+merged_covdata/
+coverage.txt
+coverage.html
+coverage.out
diff --git a/Taskfile.yml b/Taskfile.yml
index afd7d76..2808a2b 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -2,9 +2,9 @@ version: '3'
 
 tasks:
   test:
-    desc: "Run all tests"
+    desc: "Run all tests and generate a coverage report"
     cmds:
-      - go test -v ./...
+      - go test -v -coverprofile=coverage.out ./...
 
   build:
     desc: "Build the project"
diff --git a/tdd/crypt/crypt_test.go b/pkg/crypt/crypt_test.go
similarity index 100%
rename from tdd/crypt/crypt_test.go
rename to pkg/crypt/crypt_test.go
diff --git a/tdd/enchantrix/enchantrix_test.go b/pkg/enchantrix/enchantrix_test.go
similarity index 100%
rename from tdd/enchantrix/enchantrix_test.go
rename to pkg/enchantrix/enchantrix_test.go
diff --git a/tdd/trix/trix_test.go b/pkg/trix/trix_test.go
similarity index 100%
rename from tdd/trix/trix_test.go
rename to pkg/trix/trix_test.go