diff --git a/.gitignore b/.gitignore
index 36e3e4e..21df289 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,15 @@
 *.scm#*
 .#*.scm
 
+*.sls~
+*.sls#*
+.#*.sls
+
+*.sps~
+*.sps#*
+.#*.sps
+
 .DS_Store
+
+*.akku
+*.akku.sig
diff --git a/Akku.lock b/Akku.lock
new file mode 100644
index 0000000..077a5b1
--- /dev/null
+++ b/Akku.lock
@@ -0,0 +1,7 @@
+#!r6rs ; -*- mode: scheme; coding: utf-8 -*-
+;; This file is automatically generated - do not change it by hand.
+(import (akku format lockfile))
+(projects
+  ((name "chez-srfi")
+    (location (git "https://github.com/arcfide/chez-srfi"))
+    (revision "ad3b9f9020cf3b65f209866aca0b10cfc10556f3")))
diff --git a/Akku.manifest b/Akku.manifest
new file mode 100644
index 0000000..d67b1a0
--- /dev/null
+++ b/Akku.manifest
@@ -0,0 +1,9 @@
+#!r6rs ; -*- mode: scheme; coding: utf-8 -*-
+(import (akku format manifest))
+
+(akku-package ("gnuplot-pipe" "0.4.0")
+  (synopsis "Port of gnuplot-pipe egg for Chicken Scheme to Chez Scheme.")
+  (authors "Travis Hinkelman" "Francesco Montanari" "Glenn Moloney")
+  (license "GPL-3.0-or-later")
+  (depends ("chez-srfi" ">=0.0.0-akku <1.0.0"))
+)
diff --git a/LICENSE b/LICENSE
index f288702..86f0f7a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,6 @@
-                    GNU GENERAL PUBLIC LICENSE
+Valid-License-Identifier: GPL-3.0-or-later
+
+                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
diff --git a/README.md b/README.md
index 41d3947..87ff6d8 100644
--- a/README.md
+++ b/README.md
@@ -8,19 +8,14 @@ Port of [gnuplot-pipe](https://gitlab.com/montanari/gnuplot-pipe/) [egg](http://
 
 ## Installation
 
-```
-$ cd ~/scheme # where '~/scheme' is the path to your Chez Scheme libraries
-$ git clone git://github.com/hinkelman/gnuplot-pipe.git
-```
-
-For more information on installing Chez Scheme libraries, see blog posts for [macOS and Windows](https://www.travishinkelman.com/post/getting-started-with-chez-scheme-and-emacs/) or [Ubuntu](https://www.travishinkelman.com/post/getting-started-with-chez-scheme-and-emacs-ubuntu/).
+Download or clone this repository. Move `gnuplot-pipe.sls` to a directory found by `(library-directories)`. For more information on how Chez Scheme finds libraries, see blog posts for [macOS and Windows](https://www.travishinkelman.com/post/getting-started-with-chez-scheme-and-emacs/) or [Ubuntu](https://www.travishinkelman.com/post/getting-started-with-chez-scheme-and-emacs-ubuntu/).
 
 ## Usage and examples
 
 It is recommended to import `gnuplot-pipe` using a prefix, for example `gp:`.
 
 ```
-(import (prefix (gnuplot-pipe plot) gp:))
+(import (prefix (gnuplot-pipe) gp:))
 ```
 
 All `gnuplot-pipe` procedures calls must be wrapped by
diff --git a/examples.ss b/examples.ss
index c57c914..d8983d3 100644
--- a/examples.ss
+++ b/examples.ss
@@ -1,4 +1,4 @@
-(import (prefix (gnuplot-pipe plot) gp:))
+(import (prefix (gnuplot-pipe) gp:))
 
 ;;; Plot function
 (gp:call/gnuplot
diff --git a/plot.ss b/gnuplot-pipe.sls
similarity index 97%
rename from plot.ss
rename to gnuplot-pipe.sls
index e205d75..58763ba 100644
--- a/plot.ss
+++ b/gnuplot-pipe.sls
@@ -1,4 +1,4 @@
-(library (gnuplot-pipe plot)
+(library (gnuplot-pipe)
   (export
    call/gnuplot
    send
@@ -8,8 +8,8 @@
    end-data)
 
   (import (chezscheme)
-          (only (srfi s13 strings) string-join)
-          (only (srfi s1 lists) fold))
+          (only (srfi :13 strings) string-join)
+          (only (srfi :1 lists) fold))
 
   ;;---------------------------------------------------------------------
 
diff --git a/package.sc b/package.sc
deleted file mode 100644
index e4f6054..0000000
--- a/package.sc
+++ /dev/null
@@ -1,13 +0,0 @@
-(("name" . "gnuplot-pipe")
- ("version" . "0.4.0")
- ("description" . "Port of gnuplot-pipe egg for Chicken Scheme to Chez Scheme")
- ("keywords")
- ("author" 
-   ("hinkelman"))
- ("private" . #f)
- ("scripts" 
-    ("repl" . "scheme")
-    ("run" . "scheme --script"))
- ("dependencies" 
-  ("srfi" . "1.0.0")))
- 
diff --git a/test/README.md b/test/README.md
deleted file mode 100644
index 2d34550..0000000
--- a/test/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-The following lines will work when the dataframe library is available through Raven.
-
-```
-$ raven install
-$ raven run tests.ss
-```
diff --git a/test/package.sc b/test/package.sc
deleted file mode 100644
index 429ae4f..0000000
--- a/test/package.sc
+++ /dev/null
@@ -1,14 +0,0 @@
-(("name" . "gnuplot-pipe-test")
- ("version" . "0.1.0")
- ("description" . "gnuplot-pipe test")
- ("keywords")
- ("author" 
-   ("hinkelman"))
- ("private" . #f)
- ("scripts" 
-    ("repl" . "scheme")
-    ("run" . "scheme --script"))
- ("dependencies" 
-  ("srfi" . "1.0.0")
-  ("gnuplot-pipe" . "0.4.0")))
- 
diff --git a/test/tests.ss b/tests/test-gnuplot-pipe.sps
old mode 100644
new mode 100755
similarity index 93%
rename from test/tests.ss
rename to tests/test-gnuplot-pipe.sps
index 7d98856..7817bdf
--- a/test/tests.ss
+++ b/tests/test-gnuplot-pipe.sps
@@ -1,5 +1,11 @@
-(import (prefix (gnuplot-pipe plot) gp:)
-        (srfi s64 testing))
+#!/usr/bin/env scheme-script
+;; -*- mode: scheme; coding: utf-8 -*- !#
+;; SPDX-License-Identifier: GPL-3.0-or-later
+#!r6rs
+
+(import (rnrs (6))
+        (srfi :64 testing)
+        (prefix (gnuplot-pipe) gp:))
 
 ;;; macro included in the chicken version of this file wasn't working
 ;;; because the test to check if the files existed was happening before the files were written