4 files changed, 13 insertions, 17 deletions

diff --git a/dhall/Config.dhall b/dhall/Config.dhall
deleted file mode 100644
index 1c6202c..0000000
--- a/dhall/Config.dhall
+++ /dev/null
@@ -1,15 +0,0 @@
-{ rundeck_jobs_path :
-        Text
-, rundeck_project :
-        Text
-, rundeck_api_url :
-        Text
-, rundeck_api_token :
-        Text
-, rundeck_api_version :
-        Optional Natural
-, rundeck_remove_missing :
-        Optional Bool
-, rundeck_jobs_group :
-        Optional Text
-}
diff --git a/dhall/Types.dhall b/dhall/Types.dhall
deleted file mode 100644
index 2a6fa6e..0000000
--- a/dhall/Types.dhall
+++ /dev/null
@@ -1 +0,0 @@
-{ Vault = ./Vault.dhall, Config = ./Config.dhall }
diff --git a/dhall/Vault.dhall b/dhall/Vault.dhall
deleted file mode 100644
index 089da4e..0000000
--- a/dhall/Vault.dhall
+++ /dev/null
@@ -1 +0,0 @@
-{ apiToken : Text }
diff --git a/dhall/package.dhall b/dhall/package.dhall
new file mode 100644
index 0000000..ceab8c0
--- /dev/null
+++ b/dhall/package.dhall
@@ -0,0 +1,13 @@
+let Vault = { apiToken : Text }
+
+let Config =
+      { rundeck_jobs_path : Text
+      , rundeck_project : Text
+      , rundeck_api_url : Text
+      , rundeck_api_token : Text
+      , rundeck_api_version : Optional Natural
+      , rundeck_remove_missing : Optional Bool
+      , rundeck_jobs_group : Optional Text
+      }
+
+in  { Vault = Vault, Config = Config }