diff --git a/src/test/java/org/usb4java/libusb/BosDescriptorTest.java b/src/test/java/org/libusb4java/BosDescriptorTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/BosDescriptorTest.java
rename to src/test/java/org/libusb4java/BosDescriptorTest.java
diff --git a/src/test/java/org/usb4java/libusb/BosDevCapabilityDescriptorTest.java b/src/test/java/org/libusb4java/BosDevCapabilityDescriptorTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/BosDevCapabilityDescriptorTest.java
rename to src/test/java/org/libusb4java/BosDevCapabilityDescriptorTest.java
diff --git a/src/test/java/org/usb4java/libusb/ConfigDescriptorTest.java b/src/test/java/org/libusb4java/ConfigDescriptorTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/ConfigDescriptorTest.java
rename to src/test/java/org/libusb4java/ConfigDescriptorTest.java
diff --git a/src/test/java/org/usb4java/libusb/ContainerIdDescriptorTest.java b/src/test/java/org/libusb4java/ContainerIdDescriptorTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/ContainerIdDescriptorTest.java
rename to src/test/java/org/libusb4java/ContainerIdDescriptorTest.java
diff --git a/src/test/java/org/usb4java/libusb/DeviceDescriptorTest.java b/src/test/java/org/libusb4java/DeviceDescriptorTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/DeviceDescriptorTest.java
rename to src/test/java/org/libusb4java/DeviceDescriptorTest.java
diff --git a/src/test/java/org/usb4java/libusb/EndpointDescriptorTest.java b/src/test/java/org/libusb4java/EndpointDescriptorTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/EndpointDescriptorTest.java
rename to src/test/java/org/libusb4java/EndpointDescriptorTest.java
diff --git a/src/test/java/org/usb4java/libusb/InterfaceDescriptorTest.java b/src/test/java/org/libusb4java/InterfaceDescriptorTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/InterfaceDescriptorTest.java
rename to src/test/java/org/libusb4java/InterfaceDescriptorTest.java
diff --git a/src/test/java/org/usb4java/libusb/InterfaceTest.java b/src/test/java/org/libusb4java/InterfaceTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/InterfaceTest.java
rename to src/test/java/org/libusb4java/InterfaceTest.java
diff --git a/src/test/java/org/usb4java/libusb/LibUSBDeviceTest.java b/src/test/java/org/libusb4java/LibUSBDeviceTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/LibUSBDeviceTest.java
rename to src/test/java/org/libusb4java/LibUSBDeviceTest.java
diff --git a/src/test/java/org/usb4java/libusb/LibUSBGlobalTest.java b/src/test/java/org/libusb4java/LibUSBGlobalTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/LibUSBGlobalTest.java
rename to src/test/java/org/libusb4java/LibUSBGlobalTest.java
diff --git a/src/test/java/org/usb4java/libusb/LibUSBTest.java b/src/test/java/org/libusb4java/LibUSBTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/LibUSBTest.java
rename to src/test/java/org/libusb4java/LibUSBTest.java
diff --git a/src/test/java/org/usb4java/libusb/SsEndpointCompanionDescriptorTest.java b/src/test/java/org/libusb4java/SsEndpointCompanionDescriptorTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/SsEndpointCompanionDescriptorTest.java
rename to src/test/java/org/libusb4java/SsEndpointCompanionDescriptorTest.java
diff --git a/src/test/java/org/usb4java/libusb/SsUsbDeviceCapabilityDescriptorTest.java b/src/test/java/org/libusb4java/SsUsbDeviceCapabilityDescriptorTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/SsUsbDeviceCapabilityDescriptorTest.java
rename to src/test/java/org/libusb4java/SsUsbDeviceCapabilityDescriptorTest.java
diff --git a/src/test/java/org/usb4java/libusb/TransferTest.java b/src/test/java/org/libusb4java/TransferTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/TransferTest.java
rename to src/test/java/org/libusb4java/TransferTest.java
diff --git a/src/test/java/org/usb4java/libusb/Usb20ExtensionDescriptorTest.java b/src/test/java/org/libusb4java/Usb20ExtensionDescriptorTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/Usb20ExtensionDescriptorTest.java
rename to src/test/java/org/libusb4java/Usb20ExtensionDescriptorTest.java
diff --git a/src/test/java/org/usb4java/libusb/VersionTest.java b/src/test/java/org/libusb4java/VersionTest.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/VersionTest.java
rename to src/test/java/org/libusb4java/VersionTest.java
diff --git a/src/test/java/org/usb4java/libusb/mocks/PollfdListenerMock.java b/src/test/java/org/libusb4java/mocks/PollfdListenerMock.java
similarity index 100%
rename from src/test/java/org/usb4java/libusb/mocks/PollfdListenerMock.java
rename to src/test/java/org/libusb4java/mocks/PollfdListenerMock.java