diff --git a/src/main/java/org/usb4java/BosDevCapabilityDescriptor.java b/src/main/java/org/usb4java/BosDevCapabilityDescriptor.java
index 1f9104a..d21dc1b 100644
--- a/src/main/java/org/usb4java/BosDevCapabilityDescriptor.java
+++ b/src/main/java/org/usb4java/BosDevCapabilityDescriptor.java
@@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.usb4java.utils.DescriptorUtils;
 
 /**
  * A generic representation of a BOS Device Capability descriptor.
diff --git a/src/main/java/org/usb4java/utils/BufferUtils.java b/src/main/java/org/usb4java/BufferUtils.java
similarity index 98%
rename from src/main/java/org/usb4java/utils/BufferUtils.java
rename to src/main/java/org/usb4java/BufferUtils.java
index 07a92cd..2f0e2bc 100644
--- a/src/main/java/org/usb4java/utils/BufferUtils.java
+++ b/src/main/java/org/usb4java/BufferUtils.java
@@ -3,7 +3,7 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.utils;
+package org.usb4java;
 
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
diff --git a/src/main/java/org/usb4java/ConfigDescriptor.java b/src/main/java/org/usb4java/ConfigDescriptor.java
index 8ccb409..73ce4c4 100644
--- a/src/main/java/org/usb4java/ConfigDescriptor.java
+++ b/src/main/java/org/usb4java/ConfigDescriptor.java
@@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.usb4java.utils.DescriptorUtils;
 
 /**
  * A structure representing the standard USB configuration descriptor.
diff --git a/src/main/java/org/usb4java/ContainerIdDescriptor.java b/src/main/java/org/usb4java/ContainerIdDescriptor.java
index daa68ab..3f587ce 100644
--- a/src/main/java/org/usb4java/ContainerIdDescriptor.java
+++ b/src/main/java/org/usb4java/ContainerIdDescriptor.java
@@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.usb4java.utils.DescriptorUtils;
 
 /**
  * A structure representing the Container ID descriptor.
diff --git a/src/main/java/org/usb4java/ControlSetup.java b/src/main/java/org/usb4java/ControlSetup.java
index c7a798d..297fd5e 100644
--- a/src/main/java/org/usb4java/ControlSetup.java
+++ b/src/main/java/org/usb4java/ControlSetup.java
@@ -21,8 +21,6 @@ package org.usb4java;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import org.usb4java.utils.BufferUtils;
-
 /**
  * Setup packet for control transfers.
  * 
diff --git a/src/main/java/org/usb4java/utils/DescriptorUtils.java b/src/main/java/org/usb4java/DescriptorUtils.java
similarity index 98%
rename from src/main/java/org/usb4java/utils/DescriptorUtils.java
rename to src/main/java/org/usb4java/DescriptorUtils.java
index cb3c2e2..a30d1b6 100644
--- a/src/main/java/org/usb4java/utils/DescriptorUtils.java
+++ b/src/main/java/org/usb4java/DescriptorUtils.java
@@ -3,18 +3,12 @@
  * See LICENSE.md for licensing information.
  */
 
-package org.usb4java.utils;
+package org.usb4java;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.usb4java.ConfigDescriptor;
-import org.usb4java.DeviceDescriptor;
-import org.usb4java.EndpointDescriptor;
-import org.usb4java.InterfaceDescriptor;
-import org.usb4java.LibUsb;
-
 /**
  * Utility methods used for descriptor dumps.
  *
diff --git a/src/main/java/org/usb4java/DeviceDescriptor.java b/src/main/java/org/usb4java/DeviceDescriptor.java
index b73fc9e..928406d 100644
--- a/src/main/java/org/usb4java/DeviceDescriptor.java
+++ b/src/main/java/org/usb4java/DeviceDescriptor.java
@@ -22,8 +22,6 @@ import java.nio.ByteBuffer;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.usb4java.utils.BufferUtils;
-import org.usb4java.utils.DescriptorUtils;
 
 /**
  * A structure representing the standard USB device descriptor.
diff --git a/src/main/java/org/usb4java/EndpointDescriptor.java b/src/main/java/org/usb4java/EndpointDescriptor.java
index 072c7c0..0186712 100644
--- a/src/main/java/org/usb4java/EndpointDescriptor.java
+++ b/src/main/java/org/usb4java/EndpointDescriptor.java
@@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.usb4java.utils.DescriptorUtils;
 
 /**
  * A structure representing the standard USB endpoint descriptor.
diff --git a/src/main/java/org/usb4java/InterfaceDescriptor.java b/src/main/java/org/usb4java/InterfaceDescriptor.java
index 2e6d4ac..d5c3b87 100644
--- a/src/main/java/org/usb4java/InterfaceDescriptor.java
+++ b/src/main/java/org/usb4java/InterfaceDescriptor.java
@@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.usb4java.utils.DescriptorUtils;
 
 /**
  * A structure representing the standard USB interface descriptor.
diff --git a/src/main/java/org/usb4java/LibUsb.java b/src/main/java/org/usb4java/LibUsb.java
index 5350a55..b7cf7b6 100644
--- a/src/main/java/org/usb4java/LibUsb.java
+++ b/src/main/java/org/usb4java/LibUsb.java
@@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.usb4java.utils.BufferUtils;
 
 /**
  * Static class providing the constants and functions of libusb.
diff --git a/src/main/java/org/usb4java/utils/package-info.java b/src/main/java/org/usb4java/utils/package-info.java
deleted file mode 100644
index 07427df..0000000
--- a/src/main/java/org/usb4java/utils/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright (C) 2013 Klaus Reimer <k@ailis.de>
- * See LICENSE.md for licensing information.
- */
-
-/**
- * Utility classes providing static helper methods.
- */
-package org.usb4java.utils;
diff --git a/src/test/java/org/usb4java/LibUSBDeviceTest.java b/src/test/java/org/usb4java/LibUSBDeviceTest.java
index 32570d5..c34e644 100644
--- a/src/test/java/org/usb4java/LibUSBDeviceTest.java
+++ b/src/test/java/org/usb4java/LibUSBDeviceTest.java
@@ -29,7 +29,6 @@ import org.usb4java.EndpointDescriptor;
 import org.usb4java.Interface;
 import org.usb4java.InterfaceDescriptor;
 import org.usb4java.LibUsb;
-import org.usb4java.utils.BufferUtils;
 
 /**
  * Tests the device-scope methods of the {@link LibUsb} class which need a open
diff --git a/src/test/java/org/usb4java/LibUSBTest.java b/src/test/java/org/usb4java/LibUSBTest.java
index 311537c..d978e56 100644
--- a/src/test/java/org/usb4java/LibUSBTest.java
+++ b/src/test/java/org/usb4java/LibUSBTest.java
@@ -37,7 +37,6 @@ import org.usb4java.Transfer;
 import org.usb4java.Usb20ExtensionDescriptor;
 import org.usb4java.Version;
 import org.usb4java.mocks.PollfdListenerMock;
-import org.usb4java.utils.BufferUtils;
 
 /**
  * Tests the {@link LibUsb} class.
diff --git a/src/test/java/org/usb4java/utils/DescriptorUtilsTest.java b/src/test/java/org/usb4java/utils/DescriptorUtilsTest.java
index f70f950..9065909 100644
--- a/src/test/java/org/usb4java/utils/DescriptorUtilsTest.java
+++ b/src/test/java/org/usb4java/utils/DescriptorUtilsTest.java
@@ -11,8 +11,8 @@ import java.lang.reflect.Constructor;
 import java.nio.ByteBuffer;
 
 import org.junit.Test;
+import org.usb4java.DescriptorUtils;
 import org.usb4java.LibUsb;
-import org.usb4java.utils.DescriptorUtils;
 
 /**
  * Tests the {@link DescriptorUtils} class.