diff --git a/synthesizer-core.cabal b/synthesizer-core.cabal
--- a/synthesizer-core.cabal
+++ b/synthesizer-core.cabal
@@ -1,5 +1,5 @@
 Name:           synthesizer-core
-Version:        0.7.0.1
+Version:        0.7.0.2
 License:        GPL
 License-File:   LICENSE
 Author:         Henning Thielemann <haskell@henning-thielemann.de>
@@ -31,24 +31,13 @@
 Extra-Source-Files:
   Makefile
 
-Flag splitBase
-  description: Choose the new smaller, split-up base package.
-
 Flag optimizeAdvanced
   description: Enable advanced optimizations. They slow down compilation considerably.
   default:     True
 
-Flag buildProfilers
-  description: Build executables for investigating efficiency of code
-  default:     False
 
-Flag buildTests
-  description: Build test suite
-  default:     False
-
-
 Source-Repository this
-  Tag:         0.7.0.1
+  Tag:         0.7.0.2
   Type:        darcs
   Location:    http://code.haskell.org/synthesizer/core/
 
@@ -230,23 +219,21 @@
     Synthesizer.Generic.LengthSignal
 
 
-Executable test
-  If flag(buildTests)
-    Build-Depends:
-      synthesizer-core,
-      storablevector,
-      storable-tuple,
-      event-list,
-      non-empty,
-      non-negative,
-      utility-ht,
-      numeric-prelude,
-      QuickCheck,
-      random,
-      containers,
-      base
-  Else
-    Buildable: False
+Test-Suite test
+  Type: exitcode-stdio-1.0
+  Build-Depends:
+    synthesizer-core,
+    storablevector,
+    storable-tuple,
+    event-list,
+    non-empty,
+    non-negative,
+    utility-ht,
+    numeric-prelude,
+    QuickCheck,
+    random,
+    containers,
+    base
   GHC-Options: -Wall -fwarn-tabs -fwarn-incomplete-record-updates
   Hs-Source-Dirs: test, private
 
@@ -281,18 +268,16 @@
   Main-Is: Test/Main.hs
 
 
-Executable fouriertest
-  If flag(buildProfilers)
-    Build-Depends:
-      synthesizer-core,
-      numeric-prelude,
-      timeit >=1.0 && <1.1,
-      storablevector >=0.2.7 && <0.3,
-      storable-tuple >=0.0.1 && <0.1,
-      utility-ht >=0.0.5 && <0.1,
-      base >=4 && <5
-  Else
-    Buildable: False
+Benchmark fouriertest
+  Type: exitcode-stdio-1.0
+  Build-Depends:
+    synthesizer-core,
+    numeric-prelude,
+    timeit >=1.0 && <1.1,
+    storablevector >=0.2.7 && <0.3,
+    storable-tuple >=0.0.1 && <0.1,
+    utility-ht >=0.0.5 && <0.1,
+    base >=4 && <5
 
   If impl(ghc>=7.0)
     GHC-Options: -fwarn-unused-do-bind
@@ -305,19 +290,17 @@
   Hs-Source-Dirs: speedtest
   Main-Is:        Fourier.hs
 
-Executable speedtest
-  If flag(buildProfilers)
-    Build-Depends:
-      synthesizer-core,
-      numeric-prelude,
-      old-time,
-      directory,
-      binary,
-      bytestring,
-      utility-ht,
-      base
-  Else
-    Buildable: False
+Benchmark speedtest
+  Type: exitcode-stdio-1.0
+  Build-Depends:
+    synthesizer-core,
+    numeric-prelude,
+    old-time >= 1.0 && < 1.2,
+    directory >= 1.0 && < 1.3,
+    binary,
+    bytestring,
+    utility-ht,
+    base
 
   If impl(ghc>=7.0)
     GHC-Options: -fwarn-unused-do-bind
@@ -333,21 +316,17 @@
   Hs-Source-Dirs: speedtest
   Main-Is: SpeedTest.hs
 
-Executable speedtest-exp
-  If flag(buildProfilers)
-    Build-Depends:
-      synthesizer-core,
-      storablevector,
-      binary,
-      bytestring,
-      array,
-      base
-    If flag(splitBase)
-      Build-Depends:
-        old-time >= 1.0 && < 1.2,
-        directory >= 1.0 && < 1.3
-  Else
-    Buildable: False
+Benchmark speedtest-exp
+  Type: exitcode-stdio-1.0
+  Build-Depends:
+    synthesizer-core,
+    storablevector,
+    old-time,
+    directory,
+    binary,
+    bytestring,
+    array,
+    base
 
   If impl(ghc>=7.0)
     GHC-Options: -fwarn-unused-do-bind
@@ -359,16 +338,14 @@
   Hs-Source-Dirs: speedtest
   Main-Is: SpeedTestExp.hs
 
-Executable speedtest-simple
-  If flag(buildProfilers)
-    Build-Depends:
-      synthesizer-core,
-      binary,
-      bytestring,
-      old-time,
-      base
-  Else
-    Buildable: False
+Benchmark speedtest-simple
+  Type: exitcode-stdio-1.0
+  Build-Depends:
+    synthesizer-core,
+    binary,
+    bytestring,
+    old-time,
+    base
 
   If impl(ghc>=7.0)
     GHC-Options: -fwarn-unused-do-bind