diff --git a/.guix/modules/guile-equinix.scm b/.guix/modules/guile-equinix.scm
deleted file mode 100644
index 20a5262..0000000
--- a/.guix/modules/guile-equinix.scm
+++ /dev/null
@@ -1,26 +0,0 @@
-(define-module (guile-equinix-metal-package)
-  #:use-module (gnu packages guile)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (guix gexp)
-  #:use-module (guix packages)
-  #:use-module (guix git-download)
-  #:use-module (guix build-system guile)
-  #:use-module ((guix licenses) #:prefix license:))
-
-(define-public guile-equinix-metal
-  (package
- (name "guile-equinix-metal")
- (version "0.0.3")
- (source (local-file "." "guile-equinix-metal"
-		     #:select? (git-predicate
-				(dirname (assoc-ref (current-source-location) 'filename)))
-		     #:recursive? #t))
- (build-system guile-build-system)
- (native-inputs (list pkg-config guile-3.0))
- (inputs (list guile-3.0 guile-json-4))
- (synopsis "Equinix Metal SDK")
- (home-page "https://git.fixergrid.net/adam/equinix-scm")
- (description "Equinix-scm supports token exchange and talking to Metal API")
- (license license:gpl3+)))
-
-guile-equinix-metal
diff --git a/guix.scm b/guix.scm
deleted file mode 120000
index 31310b8..0000000
--- a/guix.scm
+++ /dev/null
@@ -1 +0,0 @@
-.guix/modules/guile-equinix.scm
\ No newline at end of file
diff --git a/guix.scm b/guix.scm
new file mode 100644
index 0000000..c338948
--- /dev/null
+++ b/guix.scm
@@ -0,0 +1,29 @@
+(use-modules (guix packages)
+	     (guix gexp)
+	     (guix build-system guile)
+	     (gnu packages)
+	     (gnu packages guile)
+	     (gnu packages tls)
+	     (guix git-download)
+	     (guix utils))
+
+
+(define-public guile-equinix-metal
+  (let ((vcs-file? (or (git-predicate (current-source-directory))
+		       (const #t))))
+  (package
+   (name "guile-equinix-metal")
+   (version "0.0.5")
+   (source (local-file "." "guile-equinix-metal"
+		       #:recursive? #t
+		       #:select? vcs-file?))
+   (build-system guile-build-system)
+   (arguments
+    (list #:source-directory "src"))
+   (inputs (list guile-3.0 guile-json-4 guile-gnutls))
+   (synopsis "Equinix Metal SDK")
+   (home-page "https://git.fixergrid.net/adam/equinix-scm")
+   (description "Equinix-scm supports token exchange and talking to Metal API")
+   (license #f))))
+
+guile-equinix-metal
diff --git a/metalapi/device.scm b/src/metalapi/device.scm
similarity index 100%
rename from metalapi/device.scm
rename to src/metalapi/device.scm
diff --git a/metalapi/project.scm b/src/metalapi/project.scm
similarity index 100%
rename from metalapi/project.scm
rename to src/metalapi/project.scm
diff --git a/metalapi/requests.scm b/src/metalapi/requests.scm
similarity index 100%
rename from metalapi/requests.scm
rename to src/metalapi/requests.scm
diff --git a/metalapi/vlan.scm b/src/metalapi/vlan.scm
similarity index 97%
rename from metalapi/vlan.scm
rename to src/metalapi/vlan.scm
index 6007066..ff9199c 100644
--- a/metalapi/vlan.scm
+++ b/src/metalapi/vlan.scm
@@ -1,6 +1,7 @@
 (define-module (metalapi vlan)
   #:use-module (metalapi requests)
   #:use-module (metalapi project)
+  #:use-module (json)
   #:export (build-vlan
 	    vlan->project
 	    vlan->metro-code
diff --git a/metalctrl/identity.scm b/src/metalctrl/identity.scm
similarity index 100%
rename from metalctrl/identity.scm
rename to src/metalctrl/identity.scm