diff --git a/src/Hash2Pub/.gitignore b/Hash2Pub/.gitignore
similarity index 100%
rename from src/Hash2Pub/.gitignore
rename to Hash2Pub/.gitignore
diff --git a/src/Hash2Pub/CHANGELOG.md b/Hash2Pub/CHANGELOG.md
similarity index 100%
rename from src/Hash2Pub/CHANGELOG.md
rename to Hash2Pub/CHANGELOG.md
diff --git a/src/Hash2Pub/Hash2Pub.cabal b/Hash2Pub/Hash2Pub.cabal
similarity index 77%
rename from src/Hash2Pub/Hash2Pub.cabal
rename to Hash2Pub/Hash2Pub.cabal
index f4c9de4..ac6df96 100644
--- a/src/Hash2Pub/Hash2Pub.cabal
+++ b/Hash2Pub/Hash2Pub.cabal
@@ -45,32 +45,29 @@ category:            Network
 -- README.
 extra-source-files:  CHANGELOG.md
 
-
---library
---  -- Modules exported by the library.
---  exposed-modules:     FediChord, Main
---
---  -- Modules included in this library but not exported.
---  -- other-modules:
---
---  -- LANGUAGE extensions used by modules in this package.
---  other-extensions:    GeneralizedNewtypeDeriving
---
---  -- Other library packages from which modules are imported.
---  build-depends:       base ^>=4.12.0.0, containers ^>=0.6.0.1, utf8-string ^>=1.0.1.1, network ^>=2.8.0.1, time ^>=1.8.0.2
---
---  -- Directories containing source files.
---  -- hs-source-dirs:
---
---  -- Base language which the package is written in.
---  default-language:    Haskell2010
-
 common deps
   build-depends:       base ^>=4.12.0.0, containers ^>=0.6.0.1, utf8-string ^>=1.0.1.1, network ^>=2.8.0.1, time ^>=1.8.0.2, cmdargs ^>= 0.10, cryptonite ^>= 0.25
   ghc-options:         -Wall
 
-common test-deps
-  build-depends:       hspec ^>= 2
+
+
+library
+  import: deps
+
+  -- Modules exported by the library.
+  exposed-modules:     Hash2Pub.FediChord
+
+  -- Modules included in this library but not exported.
+  -- other-modules:
+
+  -- LANGUAGE extensions used by modules in this package.
+  other-extensions:    GeneralizedNewtypeDeriving
+
+  -- Directories containing source files.
+  hs-source-dirs: src
+
+  -- Base language which the package is written in.
+  default-language:    Haskell2010
 
 executable Hash2Pub
   -- Other library packages from which modules are imported.
@@ -86,7 +83,7 @@ executable Hash2Pub
   other-extensions:    GeneralizedNewtypeDeriving
 
   -- Directories containing source files.
-  -- hs-source-dirs:
+  -- hs-source-dirs: .
 
   -- Base language which the package is written in.
   default-language:    Haskell2010
@@ -94,7 +91,7 @@ executable Hash2Pub
 
 test-suite Hash2Pub-test
   -- Test dependencies.
-  import: deps, test-deps
+  import: deps
 
   -- Base language which the package is written in.
   default-language:    Haskell2010
@@ -107,4 +104,5 @@ test-suite Hash2Pub-test
 
   -- The entrypoint to the test suite.
   main-is:             MyLibTest.hs
+  build-depends:       hspec, Hash2Pub
 
diff --git a/src/Hash2Pub/LICENSE b/Hash2Pub/LICENSE
similarity index 100%
rename from src/Hash2Pub/LICENSE
rename to Hash2Pub/LICENSE
diff --git a/src/Hash2Pub/Main.hs b/Hash2Pub/Main.hs
similarity index 80%
rename from src/Hash2Pub/Main.hs
rename to Hash2Pub/Main.hs
index 562695b..0fcbfed 100644
--- a/src/Hash2Pub/Main.hs
+++ b/Hash2Pub/Main.hs
@@ -1,4 +1,6 @@
 module Main where
 
+import FediChord
+
 main :: IO ()
 main = putStrLn "placeholder until later"
diff --git a/src/Hash2Pub/Setup.hs b/Hash2Pub/Setup.hs
similarity index 100%
rename from src/Hash2Pub/Setup.hs
rename to Hash2Pub/Setup.hs
diff --git a/src/default.nix b/Hash2Pub/default.nix
similarity index 82%
rename from src/default.nix
rename to Hash2Pub/default.nix
index 9402a2c..d3107d3 100644
--- a/src/default.nix
+++ b/Hash2Pub/default.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (pkgs) haskellPackages;
-  drv = haskellPackages.callCabal2nix "Hash2Pub" ./Hash2Pub {};
+  drv = haskellPackages.callCabal2nix "Hash2Pub" ./. {};
 in
 {
   my_project = drv;
diff --git a/src/shell.nix b/Hash2Pub/shell.nix
similarity index 100%
rename from src/shell.nix
rename to Hash2Pub/shell.nix
diff --git a/src/Hash2Pub/FediChord.hs b/Hash2Pub/src/Hash2Pub/FediChord.hs
similarity index 100%
rename from src/Hash2Pub/FediChord.hs
rename to Hash2Pub/src/Hash2Pub/FediChord.hs
diff --git a/src/Hash2Pub/test/MyLibTest.hs b/Hash2Pub/test/MyLibTest.hs
similarity index 67%
rename from src/Hash2Pub/test/MyLibTest.hs
rename to Hash2Pub/test/MyLibTest.hs
index 3e2059e..b808c81 100644
--- a/src/Hash2Pub/test/MyLibTest.hs
+++ b/Hash2Pub/test/MyLibTest.hs
@@ -1,4 +1,6 @@
 module Main (main) where
 
+import qualified Hash2Pub.FediChord as FC
+
 main :: IO ()
 main = putStrLn "Test suite not yet implemented."