diff --git a/.gitignore b/.gitignore
index a923ba7..3e71455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /dist-newstyle/
-/wolfram.cabal
+/result/
diff --git a/package.yaml b/package.yaml
deleted file mode 100644
index cf780cc..0000000
--- a/package.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-name:                wolfram
-version:             0.1.0.0
-license:             BSD3
-author:              "Jean-Charles Quillet"
-maintainer:          "jeancharles.quillet@gmail.com"
-copyright:           "2021 Jean-Charles Quillet"
-
-dependencies:
-- name: base
-
-library:
-  source-dirs: src
-
-executables:
-  wolfram:
-    main: Main.hs
-    source-dirs: wolfram
-    dependencies:
-      - wolfram
-
-ghc-options:
-  -Wall
-  -Wcompat
-  -Widentities
-  -Wincomplete-record-updates
-  -Wincomplete-uni-patterns
-  -Wpartial-fields
-  -Wredundant-constraints
-
-tests:
-  spec:
-    main:                Spec.hs
-    source-dirs:         test
-    dependencies:
-    - wolfram
-    - hspec
-
-default-extensions:
-  - OverloadedStrings
-  - ScopedTypeVariables
-  - TupleSections
diff --git a/wolfram.cabal b/wolfram.cabal
new file mode 100644
index 0000000..d451e1a
--- /dev/null
+++ b/wolfram.cabal
@@ -0,0 +1,46 @@
+cabal-version: 2.2
+
+name: wolfram
+version: 0.1.0.0
+build-type: Simple
+
+common defaults
+  default-language: Haskell2010
+  default-extensions:
+    OverloadedStrings
+    ScopedTypeVariables
+    TupleSections
+  ghc-options:
+    -Wall
+    -Wcompat
+    -Widentities
+    -Wincomplete-record-updates
+    -Wincomplete-uni-patterns
+    -Wpartial-fields
+    -Wredundant-constraints
+  build-depends: base
+
+library
+  import: defaults
+  exposed-modules:
+    Options
+    Wolfram
+  hs-source-dirs: src
+
+executable wolfram
+  import: defaults
+  main-is: Main.hs
+  hs-source-dirs: wolfram
+  build-depends: wolfram
+
+test-suite spec
+  import: defaults
+  type: exitcode-stdio-1.0
+  main-is: Spec.hs
+  other-modules:
+    OptionsSpec
+    WolframSpec
+  hs-source-dirs: test
+  build-depends:
+    hspec,
+    wolfram