diff --git a/examples/eval/eval_fn/Main.hs b/examples/eval/eval_fn/Main.hs
index 27b8b8b..794aee8 100644
--- a/examples/eval/eval_fn/Main.hs
+++ b/examples/eval/eval_fn/Main.hs
@@ -6,5 +6,5 @@
 --
 import Eval.Haskell
 
-main = do fn <- unsafeEval "(\\(x::Int) -> (x,x))" [] :: IO (Maybe (Int -> (Int,Int)))
+main = do fn <- unsafeEval "(\\x -> (x,x::Int))" [] :: IO (Maybe (Int -> (Int,Int)))
           when (isJust fn) $ putStrLn $ show $ (fromJust fn) 7
diff --git a/examples/hmake/lib-plugs/Main.hs b/examples/plugs/plugs/Main.hs
similarity index 100%
rename from examples/hmake/lib-plugs/Main.hs
rename to examples/plugs/plugs/Main.hs
diff --git a/examples/hmake/lib-plugs/Makefile b/examples/plugs/plugs/Makefile
similarity index 100%
rename from examples/hmake/lib-plugs/Makefile
rename to examples/plugs/plugs/Makefile
diff --git a/examples/hmake/lib-plugs/expected b/examples/plugs/plugs/expected
similarity index 100%
rename from examples/hmake/lib-plugs/expected
rename to examples/plugs/plugs/expected
diff --git a/examples/hmake/lib-plugs/test.in b/examples/plugs/plugs/test.in
similarity index 100%
rename from examples/hmake/lib-plugs/test.in
rename to examples/plugs/plugs/test.in
diff --git a/examples/hmake/one-shot/Main.hs b/examples/plugs/runplugs/Main.hs
similarity index 100%
rename from examples/hmake/one-shot/Main.hs
rename to examples/plugs/runplugs/Main.hs
diff --git a/examples/hmake/one-shot/Makefile b/examples/plugs/runplugs/Makefile
similarity index 100%
rename from examples/hmake/one-shot/Makefile
rename to examples/plugs/runplugs/Makefile
diff --git a/examples/hmake/one-shot/expected b/examples/plugs/runplugs/expected
similarity index 100%
rename from examples/hmake/one-shot/expected
rename to examples/plugs/runplugs/expected
diff --git a/examples/hmake/one-shot/test.in b/examples/plugs/runplugs/test.in
similarity index 100%
rename from examples/hmake/one-shot/test.in
rename to examples/plugs/runplugs/test.in