diff --git a/hie.yaml b/hie.yaml
index 294d99956..350ef3c8e 100644
--- a/hie.yaml
+++ b/hie.yaml
@@ -16,28 +16,36 @@ cradle:
       config:
         cradle:
           cabal:
+            - path: "./benchmark/lib/"
+              component: "lib:streamly-benchmarks"
             - path: "./benchmark/Streamly/Benchmark/Data/Array.hs"
               component: "bench:Data.Array"
             - path: "./benchmark/Streamly/Benchmark/Data/Array/Generic.hs"
               component: "bench:Data.Array.Generic"
-            - path: "./benchmark/Streamly/Benchmark/Data/MutArray.hs"
-              component: "bench:Data.MutArray"
             - path: "./benchmark/Streamly/Benchmark/Data/Array/Stream.hs"
               component: "bench:Data.Array.Stream"
             - path: "./benchmark/Streamly/Benchmark/Data/Fold.hs"
               component: "bench:Data.Fold"
+            - path: "./benchmark/Streamly/Benchmark/Data/Fold/Window.hs"
+              component: "bench:Data.Fold.Window"
+            - path: "./benchmark/Streamly/Benchmark/Data/MutArray.hs"
+              component: "bench:Data.MutArray"
             - path: "./benchmark/Streamly/Benchmark/Data/Parser.hs"
               component: "bench:Data.Parser"
             - path: "./benchmark/Streamly/Benchmark/Data/ParserK.hs"
               component: "bench:Data.ParserK"
-            - path: "./benchmark/Streamly/Benchmark/Data/Stream/StreamD.hs"
-              component: "bench:Data.StreamD"
-            - path: "./benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs"
+            - path: "./benchmark/Streamly/Benchmark/Data/StreamK.hs"
               component: "bench:Data.StreamK"
-            - path: "./benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs"
-              component: "bench:Data.Stream.ToStreamK"
+            - path: "./benchmark/Streamly/Benchmark/Data/StreamK/FromStream.hs"
+              component: "bench:Data.StreamK.FromStream"
             - path: "./benchmark/Streamly/Benchmark/Data/Stream/Common.hs"
               component: "bench:Data.Stream"
+            - path: "./benchmark/Streamly/Benchmark/Data/Stream/Concurrent.hs"
+              component: "bench:Data.Stream.Concurrent"
+            - path: "./benchmark/Streamly/Benchmark/Data/Stream/ConcurrentCommon.hs"
+              component: "bench:Data.Stream.Concurrent"
+            - path: "./benchmark/Streamly/Benchmark/Data/Stream/ConcurrentEager.hs"
+              component: "bench:Data.Stream.ConcurrentEager"
             - path: "./benchmark/Streamly/Benchmark/Data/Stream/Eliminate.hs"
               component: "bench:Data.Stream"
             - path: "./benchmark/Streamly/Benchmark/Data/Stream/Expand.hs"
@@ -52,12 +60,6 @@ cradle:
               component: "bench:Data.Stream"
             - path: "./benchmark/Streamly/Benchmark/Data/Stream/Transform.hs"
               component: "bench:Data.Stream"
-            - path: "./benchmark/Streamly/Benchmark/Data/Stream/Concurrent.hs"
-              component: "bench:Data.Stream.Concurrent"
-            - path: "./benchmark/Streamly/Benchmark/Data/Stream/ConcurrentCommon.hs"
-              component: "bench:Data.Stream.Concurrent"
-            - path: "./benchmark/Streamly/Benchmark/Data/Stream/ConcurrentEager.hs"
-              component: "bench:Data.Stream.ConcurrentEager"
             - path: "./benchmark/Streamly/Benchmark/Data/Unfold.hs"
               component: "bench:Data.Unfold"
             - path: "./benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs"
@@ -78,16 +80,12 @@ cradle:
               component: "bench:Prelude.ZipSerial"
             - path: "./benchmark/Streamly/Benchmark/Unicode/Char.hs"
               component: "bench:Unicode.Char"
+            - path: "./benchmark/Streamly/Benchmark/Unicode/Parser.hs"
+              component: "bench:Unicode.Parser"
             - path: "./benchmark/Streamly/Benchmark/Unicode/Stream.hs"
               component: "bench:Unicode.Stream"
             - path: "./benchmark/Streamly/Benchmark/Unicode/Utf8.hs"
               component: "bench:Unicode.Utf8"
-            - path: "./benchmark/lib/"
-              component: "lib:streamly-benchmarks"
-            - path: "./benchmark/Streamly/Benchmark/Data/Fold/Window.hs"
-              component: "bench:Data.Fold.Window"
-            - path: "./benchmark/Streamly/Benchmark/Unicode/Parser.hs"
-              component: "bench:Unicode.Parser"
     - path: "./test"
       config:
         cradle: