Index: streamexecutor/include/streamexecutor/Device.h
===================================================================
--- streamexecutor/include/streamexecutor/Device.h
+++ streamexecutor/include/streamexecutor/Device.h
@@ -17,9 +17,9 @@
 
 #include <type_traits>
 
+#include "streamexecutor/Error.h"
 #include "streamexecutor/KernelSpec.h"
 #include "streamexecutor/PlatformDevice.h"
-#include "streamexecutor/Utils/Error.h"
 
 namespace streamexecutor {
 
Index: streamexecutor/include/streamexecutor/DeviceMemory.h
===================================================================
--- streamexecutor/include/streamexecutor/DeviceMemory.h
+++ streamexecutor/include/streamexecutor/DeviceMemory.h
@@ -32,7 +32,7 @@
 #include <cassert>
 #include <cstddef>
 
-#include "streamexecutor/Utils/Error.h"
+#include "streamexecutor/Error.h"
 
 namespace streamexecutor {
 
Index: streamexecutor/include/streamexecutor/Error.h
===================================================================
--- streamexecutor/include/streamexecutor/Error.h
+++ streamexecutor/include/streamexecutor/Error.h
@@ -160,8 +160,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef STREAMEXECUTOR_UTILS_ERROR_H
-#define STREAMEXECUTOR_UTILS_ERROR_H
+#ifndef STREAMEXECUTOR_ERROR_H
+#define STREAMEXECUTOR_ERROR_H
 
 #include <cstdio>
 #include <cstdlib>
@@ -212,4 +212,4 @@
 
 } // namespace streamexecutor
 
-#endif // STREAMEXECUTOR_UTILS_ERROR_H
+#endif // STREAMEXECUTOR_ERROR_H
Index: streamexecutor/include/streamexecutor/Kernel.h
===================================================================
--- streamexecutor/include/streamexecutor/Kernel.h
+++ streamexecutor/include/streamexecutor/Kernel.h
@@ -21,8 +21,8 @@
 #ifndef STREAMEXECUTOR_KERNEL_H
 #define STREAMEXECUTOR_KERNEL_H
 
+#include "streamexecutor/Error.h"
 #include "streamexecutor/KernelSpec.h"
-#include "streamexecutor/Utils/Error.h"
 
 #include <memory>
 
Index: streamexecutor/include/streamexecutor/Platform.h
===================================================================
--- streamexecutor/include/streamexecutor/Platform.h
+++ streamexecutor/include/streamexecutor/Platform.h
@@ -18,7 +18,7 @@
 #ifndef STREAMEXECUTOR_PLATFORM_H
 #define STREAMEXECUTOR_PLATFORM_H
 
-#include "streamexecutor/Utils/Error.h"
+#include "streamexecutor/Error.h"
 
 namespace streamexecutor {
 
Index: streamexecutor/include/streamexecutor/PlatformDevice.h
===================================================================
--- streamexecutor/include/streamexecutor/PlatformDevice.h
+++ streamexecutor/include/streamexecutor/PlatformDevice.h
@@ -20,10 +20,10 @@
 #define STREAMEXECUTOR_PLATFORMDEVICE_H
 
 #include "streamexecutor/DeviceMemory.h"
+#include "streamexecutor/Error.h"
 #include "streamexecutor/Kernel.h"
 #include "streamexecutor/LaunchDimensions.h"
 #include "streamexecutor/PackedKernelArgumentArray.h"
-#include "streamexecutor/Utils/Error.h"
 
 namespace streamexecutor {
 
Index: streamexecutor/include/streamexecutor/PlatformManager.h
===================================================================
--- streamexecutor/include/streamexecutor/PlatformManager.h
+++ streamexecutor/include/streamexecutor/PlatformManager.h
@@ -21,8 +21,8 @@
 
 #include <map>
 
+#include "streamexecutor/Error.h"
 #include "streamexecutor/Platform.h"
-#include "streamexecutor/Utils/Error.h"
 
 namespace streamexecutor {
 
Index: streamexecutor/include/streamexecutor/Stream.h
===================================================================
--- streamexecutor/include/streamexecutor/Stream.h
+++ streamexecutor/include/streamexecutor/Stream.h
@@ -35,11 +35,11 @@
 #include <string>
 
 #include "streamexecutor/DeviceMemory.h"
+#include "streamexecutor/Error.h"
 #include "streamexecutor/Kernel.h"
 #include "streamexecutor/LaunchDimensions.h"
 #include "streamexecutor/PackedKernelArgumentArray.h"
 #include "streamexecutor/PlatformDevice.h"
-#include "streamexecutor/Utils/Error.h"
 
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/Twine.h"
Index: streamexecutor/lib/CMakeLists.txt
===================================================================
--- streamexecutor/lib/CMakeLists.txt
+++ streamexecutor/lib/CMakeLists.txt
@@ -3,12 +3,11 @@
   set_target_properties(${name} PROPERTIES FOLDER "streamexecutor libraries")
 endmacro(add_se_library)
 
-add_subdirectory(Utils)
-
 add_se_library(
     streamexecutor
     Device.cpp
     DeviceMemory.cpp
+    Error.cpp
     Kernel.cpp
     KernelSpec.cpp
     PackedKernelArgumentArray.cpp
@@ -16,9 +15,6 @@
     PlatformDevice.cpp
     PlatformManager.cpp
     Stream.cpp
-
-    LINK_LIBS
-      utils
     )
 
 install(TARGETS streamexecutor DESTINATION lib)
Index: streamexecutor/lib/Error.cpp
===================================================================
--- streamexecutor/lib/Error.cpp
+++ streamexecutor/lib/Error.cpp
@@ -12,7 +12,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "streamexecutor/Utils/Error.h"
+#include "streamexecutor/Error.h"
 
 #include "llvm/ADT/StringRef.h"
 
Index: streamexecutor/lib/Utils/CMakeLists.txt
===================================================================
--- streamexecutor/lib/Utils/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_se_library(
-  utils
-  Error.cpp)