diff --git a/ipscan-unittest/test/net/azib/ipscan/MainTest.java b/ipscan-unittest/src/net/azib/ipscan/MainTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/MainTest.java
rename to ipscan-unittest/src/net/azib/ipscan/MainTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/config/ConfigTest.java b/ipscan-unittest/src/net/azib/ipscan/config/ConfigTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/config/ConfigTest.java
rename to ipscan-unittest/src/net/azib/ipscan/config/ConfigTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/config/DimensionsConfigTest.java b/ipscan-unittest/src/net/azib/ipscan/config/DimensionsConfigTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/config/DimensionsConfigTest.java
rename to ipscan-unittest/src/net/azib/ipscan/config/DimensionsConfigTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/config/LabelsTest.java b/ipscan-unittest/src/net/azib/ipscan/config/LabelsTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/config/LabelsTest.java
rename to ipscan-unittest/src/net/azib/ipscan/config/LabelsTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/config/NamedListConfigTest.java b/ipscan-unittest/src/net/azib/ipscan/config/NamedListConfigTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/config/NamedListConfigTest.java
rename to ipscan-unittest/src/net/azib/ipscan/config/NamedListConfigTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/config/OpenersConfigTest.java b/ipscan-unittest/src/net/azib/ipscan/config/OpenersConfigTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/config/OpenersConfigTest.java
rename to ipscan-unittest/src/net/azib/ipscan/config/OpenersConfigTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/core/InetAddressUtilsTest.java b/ipscan-unittest/src/net/azib/ipscan/core/InetAddressUtilsTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/core/InetAddressUtilsTest.java
rename to ipscan-unittest/src/net/azib/ipscan/core/InetAddressUtilsTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/core/IntegerWithUnitTest.java b/ipscan-unittest/src/net/azib/ipscan/core/IntegerWithUnitTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/core/IntegerWithUnitTest.java
rename to ipscan-unittest/src/net/azib/ipscan/core/IntegerWithUnitTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/core/NotAvailableValueTest.java b/ipscan-unittest/src/net/azib/ipscan/core/NotAvailableValueTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/core/NotAvailableValueTest.java
rename to ipscan-unittest/src/net/azib/ipscan/core/NotAvailableValueTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/core/NotScannedValueTest.java b/ipscan-unittest/src/net/azib/ipscan/core/NotScannedValueTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/core/NotScannedValueTest.java
rename to ipscan-unittest/src/net/azib/ipscan/core/NotScannedValueTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/core/PortIteratorTest.java b/ipscan-unittest/src/net/azib/ipscan/core/PortIteratorTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/core/PortIteratorTest.java
rename to ipscan-unittest/src/net/azib/ipscan/core/PortIteratorTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/core/ScannerTest.java b/ipscan-unittest/src/net/azib/ipscan/core/ScannerTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/core/ScannerTest.java
rename to ipscan-unittest/src/net/azib/ipscan/core/ScannerTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/core/ScanningResultListTest.java b/ipscan-unittest/src/net/azib/ipscan/core/ScanningResultListTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/core/ScanningResultListTest.java
rename to ipscan-unittest/src/net/azib/ipscan/core/ScanningResultListTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/core/net/ICMPSharedPingerTest.java b/ipscan-unittest/src/net/azib/ipscan/core/net/ICMPSharedPingerTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/core/net/ICMPSharedPingerTest.java
rename to ipscan-unittest/src/net/azib/ipscan/core/net/ICMPSharedPingerTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/core/net/PingerRegistryImplTest.java b/ipscan-unittest/src/net/azib/ipscan/core/net/PingerRegistryImplTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/core/net/PingerRegistryImplTest.java
rename to ipscan-unittest/src/net/azib/ipscan/core/net/PingerRegistryImplTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/exporters/AbstractExporterTestCase.java b/ipscan-unittest/src/net/azib/ipscan/exporters/AbstractExporterTestCase.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/exporters/AbstractExporterTestCase.java
rename to ipscan-unittest/src/net/azib/ipscan/exporters/AbstractExporterTestCase.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/exporters/CSVExporterTest.java b/ipscan-unittest/src/net/azib/ipscan/exporters/CSVExporterTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/exporters/CSVExporterTest.java
rename to ipscan-unittest/src/net/azib/ipscan/exporters/CSVExporterTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/exporters/ExportProcessorTest.java b/ipscan-unittest/src/net/azib/ipscan/exporters/ExportProcessorTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/exporters/ExportProcessorTest.java
rename to ipscan-unittest/src/net/azib/ipscan/exporters/ExportProcessorTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/exporters/ExporterRegistryTest.java b/ipscan-unittest/src/net/azib/ipscan/exporters/ExporterRegistryTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/exporters/ExporterRegistryTest.java
rename to ipscan-unittest/src/net/azib/ipscan/exporters/ExporterRegistryTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/exporters/IPListExporterTest.java b/ipscan-unittest/src/net/azib/ipscan/exporters/IPListExporterTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/exporters/IPListExporterTest.java
rename to ipscan-unittest/src/net/azib/ipscan/exporters/IPListExporterTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/exporters/TXTExporterTest.java b/ipscan-unittest/src/net/azib/ipscan/exporters/TXTExporterTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/exporters/TXTExporterTest.java
rename to ipscan-unittest/src/net/azib/ipscan/exporters/TXTExporterTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/exporters/XMLExporterTest.java b/ipscan-unittest/src/net/azib/ipscan/exporters/XMLExporterTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/exporters/XMLExporterTest.java
rename to ipscan-unittest/src/net/azib/ipscan/exporters/XMLExporterTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/feeders/FeederTestUtils.java b/ipscan-unittest/src/net/azib/ipscan/feeders/FeederTestUtils.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/feeders/FeederTestUtils.java
rename to ipscan-unittest/src/net/azib/ipscan/feeders/FeederTestUtils.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/feeders/FileFeederTest.java b/ipscan-unittest/src/net/azib/ipscan/feeders/FileFeederTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/feeders/FileFeederTest.java
rename to ipscan-unittest/src/net/azib/ipscan/feeders/FileFeederTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/feeders/RandomFeederTest.java b/ipscan-unittest/src/net/azib/ipscan/feeders/RandomFeederTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/feeders/RandomFeederTest.java
rename to ipscan-unittest/src/net/azib/ipscan/feeders/RandomFeederTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/feeders/RangeFeederTest.java b/ipscan-unittest/src/net/azib/ipscan/feeders/RangeFeederTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/feeders/RangeFeederTest.java
rename to ipscan-unittest/src/net/azib/ipscan/feeders/RangeFeederTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/fetchers/AbstractFetcherTestCase.java b/ipscan-unittest/src/net/azib/ipscan/fetchers/AbstractFetcherTestCase.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/fetchers/AbstractFetcherTestCase.java
rename to ipscan-unittest/src/net/azib/ipscan/fetchers/AbstractFetcherTestCase.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/fetchers/HostnameFetcherTest.java b/ipscan-unittest/src/net/azib/ipscan/fetchers/HostnameFetcherTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/fetchers/HostnameFetcherTest.java
rename to ipscan-unittest/src/net/azib/ipscan/fetchers/HostnameFetcherTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/fetchers/IPFetcherTest.java b/ipscan-unittest/src/net/azib/ipscan/fetchers/IPFetcherTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/fetchers/IPFetcherTest.java
rename to ipscan-unittest/src/net/azib/ipscan/fetchers/IPFetcherTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/fetchers/PingFetcherTest.java b/ipscan-unittest/src/net/azib/ipscan/fetchers/PingFetcherTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/fetchers/PingFetcherTest.java
rename to ipscan-unittest/src/net/azib/ipscan/fetchers/PingFetcherTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/fetchers/PingTTLFetcherTest.java b/ipscan-unittest/src/net/azib/ipscan/fetchers/PingTTLFetcherTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/fetchers/PingTTLFetcherTest.java
rename to ipscan-unittest/src/net/azib/ipscan/fetchers/PingTTLFetcherTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/fetchers/PortsFetcherTest.java b/ipscan-unittest/src/net/azib/ipscan/fetchers/PortsFetcherTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/fetchers/PortsFetcherTest.java
rename to ipscan-unittest/src/net/azib/ipscan/fetchers/PortsFetcherTest.java
diff --git a/ipscan-unittest/test/net/azib/ipscan/gui/actions/OpenerLauncherTest.java b/ipscan-unittest/src/net/azib/ipscan/gui/actions/OpenerLauncherTest.java
similarity index 100%
rename from ipscan-unittest/test/net/azib/ipscan/gui/actions/OpenerLauncherTest.java
rename to ipscan-unittest/src/net/azib/ipscan/gui/actions/OpenerLauncherTest.java