diff --git a/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/CommandRepository.java b/adapter-commons/src/main/java/io/dddbyexamples/tools/CommandRepository.java
similarity index 94%
rename from adapter-commons/src/main/java/pl/com/dddbyexamples/tools/CommandRepository.java
rename to adapter-commons/src/main/java/io/dddbyexamples/tools/CommandRepository.java
index 7b269e7..cb32c94 100644
--- a/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/CommandRepository.java
+++ b/adapter-commons/src/main/java/io/dddbyexamples/tools/CommandRepository.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.tools;
+package io.dddbyexamples.tools;
 
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.rest.core.annotation.RestResource;
diff --git a/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/JsonConverter.java b/adapter-commons/src/main/java/io/dddbyexamples/tools/JsonConverter.java
similarity index 97%
rename from adapter-commons/src/main/java/pl/com/dddbyexamples/tools/JsonConverter.java
rename to adapter-commons/src/main/java/io/dddbyexamples/tools/JsonConverter.java
index 6d7fe5a..c7b355d 100644
--- a/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/JsonConverter.java
+++ b/adapter-commons/src/main/java/io/dddbyexamples/tools/JsonConverter.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.tools;
+package io.dddbyexamples.tools;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
diff --git a/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/ProjectionRepository.java b/adapter-commons/src/main/java/io/dddbyexamples/tools/ProjectionRepository.java
similarity index 95%
rename from adapter-commons/src/main/java/pl/com/dddbyexamples/tools/ProjectionRepository.java
rename to adapter-commons/src/main/java/io/dddbyexamples/tools/ProjectionRepository.java
index 7692a0a..c08f3eb 100644
--- a/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/ProjectionRepository.java
+++ b/adapter-commons/src/main/java/io/dddbyexamples/tools/ProjectionRepository.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.tools;
+package io.dddbyexamples.tools;
 
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.rest.core.annotation.RestResource;
diff --git a/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/TechnicalId.java b/adapter-commons/src/main/java/io/dddbyexamples/tools/TechnicalId.java
similarity index 92%
rename from adapter-commons/src/main/java/pl/com/dddbyexamples/tools/TechnicalId.java
rename to adapter-commons/src/main/java/io/dddbyexamples/tools/TechnicalId.java
index 21e7290..18c0ce0 100644
--- a/adapter-commons/src/main/java/pl/com/dddbyexamples/tools/TechnicalId.java
+++ b/adapter-commons/src/main/java/io/dddbyexamples/tools/TechnicalId.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.tools;
+package io.dddbyexamples.tools;
 
 import java.util.Optional;
 
diff --git a/adapter-commons/src/test/java/pl/com/dddbyexamples/tools/IntegrationTest.java b/adapter-commons/src/test/java/io/dddbyexamples/tools/IntegrationTest.java
similarity index 94%
rename from adapter-commons/src/test/java/pl/com/dddbyexamples/tools/IntegrationTest.java
rename to adapter-commons/src/test/java/io/dddbyexamples/tools/IntegrationTest.java
index bc8491a..8d412b7 100644
--- a/adapter-commons/src/test/java/pl/com/dddbyexamples/tools/IntegrationTest.java
+++ b/adapter-commons/src/test/java/io/dddbyexamples/tools/IntegrationTest.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.tools;
+package io.dddbyexamples.tools;
 
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.annotation.AliasFor;
diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/AppConfiguration.java b/app-monolith/src/main/java/io/dddbyexamples/factory/AppConfiguration.java
similarity index 83%
rename from app-monolith/src/main/java/pl/com/dddbyexamples/factory/AppConfiguration.java
rename to app-monolith/src/main/java/io/dddbyexamples/factory/AppConfiguration.java
index f4971c9..d33a88f 100644
--- a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/AppConfiguration.java
+++ b/app-monolith/src/main/java/io/dddbyexamples/factory/AppConfiguration.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory;
+package io.dddbyexamples.factory;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -6,8 +6,8 @@ import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.Stock;
-import pl.com.dddbyexamples.factory.warehouse.WarehouseService;
+import io.dddbyexamples.factory.shortages.prediction.calculation.Stock;
+import io.dddbyexamples.factory.warehouse.WarehouseService;
 
 import java.time.Clock;
 
diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEventsPropagation.java b/app-monolith/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEventsPropagation.java
similarity index 82%
rename from app-monolith/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEventsPropagation.java
rename to app-monolith/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEventsPropagation.java
index 65a1d16..a872c57 100644
--- a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEventsPropagation.java
+++ b/app-monolith/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEventsPropagation.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.delivery.planning.definition;
+package io.dddbyexamples.factory.delivery.planning.definition;
 
 import lombok.AllArgsConstructor;
 import org.springframework.data.rest.core.annotation.HandleAfterCreate;
@@ -6,7 +6,7 @@ import org.springframework.data.rest.core.annotation.HandleAfterSave;
 import org.springframework.data.rest.core.annotation.RepositoryEventHandler;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import pl.com.dddbyexamples.factory.delivery.planning.projection.DeliveryForecastProjection;
+import io.dddbyexamples.factory.delivery.planning.projection.DeliveryForecastProjection;
 
 @Component
 @Transactional
diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEventsPropagation.java b/app-monolith/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandEventsPropagation.java
similarity index 69%
rename from app-monolith/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEventsPropagation.java
rename to app-monolith/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandEventsPropagation.java
index 00c7d43..39c4ff4 100644
--- a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEventsPropagation.java
+++ b/app-monolith/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandEventsPropagation.java
@@ -1,13 +1,13 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
+import io.dddbyexamples.factory.delivery.planning.projection.DeliveryForecastProjection;
+import io.dddbyexamples.factory.demand.forecasting.command.RequiredReviewDao;
+import io.dddbyexamples.factory.demand.forecasting.command.RequiredReviewEntity;
+import io.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandProjection;
+import io.dddbyexamples.factory.shortages.prediction.monitoring.ShortagePredictionService;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
-import pl.com.dddbyexamples.factory.delivery.planning.projection.DeliveryForecastProjection;
-import pl.com.dddbyexamples.factory.demand.forecasting.command.RequiredReviewDao;
-import pl.com.dddbyexamples.factory.demand.forecasting.command.RequiredReviewEntity;
-import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandProjection;
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortagePredictionService;
 
 import java.time.Clock;
 import java.time.Instant;
diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEventsPropagation.java b/app-monolith/src/main/java/io/dddbyexamples/factory/product/management/ProductDescriptionEventsPropagation.java
similarity index 77%
rename from app-monolith/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEventsPropagation.java
rename to app-monolith/src/main/java/io/dddbyexamples/factory/product/management/ProductDescriptionEventsPropagation.java
index f9b7b3e..c509c99 100644
--- a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEventsPropagation.java
+++ b/app-monolith/src/main/java/io/dddbyexamples/factory/product/management/ProductDescriptionEventsPropagation.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.product.management;
+package io.dddbyexamples.factory.product.management;
 
 import lombok.AllArgsConstructor;
 import org.springframework.data.rest.core.annotation.HandleAfterCreate;
@@ -6,9 +6,9 @@ import org.springframework.data.rest.core.annotation.HandleAfterDelete;
 import org.springframework.data.rest.core.annotation.RepositoryEventHandler;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandService;
-import pl.com.dddbyexamples.factory.stock.forecast.ressource.StockForecastDao;
-import pl.com.dddbyexamples.factory.stock.forecast.ressource.StockForecastEntity;
+import io.dddbyexamples.factory.demand.forecasting.DemandService;
+import io.dddbyexamples.factory.stock.forecast.ressource.StockForecastDao;
+import io.dddbyexamples.factory.stock.forecast.ressource.StockForecastEntity;
 
 @Component
 @Transactional
diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ForecastORMRepository.java b/app-monolith/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ForecastORMRepository.java
similarity index 77%
rename from app-monolith/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ForecastORMRepository.java
rename to app-monolith/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ForecastORMRepository.java
index eda0ae5..63b04db 100644
--- a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ForecastORMRepository.java
+++ b/app-monolith/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ForecastORMRepository.java
@@ -1,13 +1,13 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.calculation;
+package io.dddbyexamples.factory.shortages.prediction.calculation;
 
+import io.dddbyexamples.factory.production.planning.projection.ProductionOutputDao;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
-import pl.com.dddbyexamples.factory.delivery.planning.projection.DeliveryForecastDao;
-import pl.com.dddbyexamples.factory.delivery.planning.projection.DeliveryForecastEntity;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-import pl.com.dddbyexamples.factory.production.planning.projection.ProductionOutputDao;
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ProductionForecast.Item;
-import pl.com.dddbyexamples.factory.warehouse.WarehouseService;
+import io.dddbyexamples.factory.delivery.planning.projection.DeliveryForecastDao;
+import io.dddbyexamples.factory.delivery.planning.projection.DeliveryForecastEntity;
+import io.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.factory.shortages.prediction.calculation.ProductionForecast.Item;
+import io.dddbyexamples.factory.warehouse.WarehouseService;
 
 import java.time.Clock;
 import java.time.LocalDateTime;
diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEventsPropagation.java b/app-monolith/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEventsPropagation.java
similarity index 73%
rename from app-monolith/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEventsPropagation.java
rename to app-monolith/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEventsPropagation.java
index 7902cd5..a4b6b6d 100644
--- a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEventsPropagation.java
+++ b/app-monolith/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEventsPropagation.java
@@ -1,9 +1,9 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring;
+package io.dddbyexamples.factory.shortages.prediction.monitoring;
 
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
-import pl.com.dddbyexamples.factory.shortages.prediction.notification.NotificationOfShortage;
+import io.dddbyexamples.factory.shortages.prediction.notification.NotificationOfShortage;
 
 @Lazy
 @Component
diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecast.java b/app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/StockForecast.java
similarity index 87%
rename from app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecast.java
rename to app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/StockForecast.java
index fa70bf6..83f8bd1 100644
--- a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecast.java
+++ b/app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/StockForecast.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.stock.forecast;
+package io.dddbyexamples.factory.stock.forecast;
 
 import lombok.Builder;
 import lombok.Singular;
diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecastQuery.java b/app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/StockForecastQuery.java
similarity index 77%
rename from app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecastQuery.java
rename to app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/StockForecastQuery.java
index 0059d16..480736c 100644
--- a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/StockForecastQuery.java
+++ b/app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/StockForecastQuery.java
@@ -1,16 +1,16 @@
-package pl.com.dddbyexamples.factory.stock.forecast;
+package io.dddbyexamples.factory.stock.forecast;
 
+import io.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandDao;
+import io.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity;
+import io.dddbyexamples.factory.production.planning.projection.ProductionDailyOutputDao;
+import io.dddbyexamples.factory.production.planning.projection.ProductionDailyOutputEntity;
+import io.dddbyexamples.factory.shortages.prediction.calculation.Stock;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandDao;
-import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-import pl.com.dddbyexamples.factory.production.planning.projection.ProductionDailyOutputDao;
-import pl.com.dddbyexamples.factory.production.planning.projection.ProductionDailyOutputEntity;
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.Stock;
-import pl.com.dddbyexamples.factory.stock.forecast.StockForecast.StockForecastBuilder;
-import pl.com.dddbyexamples.factory.warehouse.WarehouseService;
+import io.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.factory.stock.forecast.StockForecast.StockForecastBuilder;
+import io.dddbyexamples.factory.warehouse.WarehouseService;
 
 import java.time.Clock;
 import java.time.LocalDate;
diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastDao.java b/app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/ressource/StockForecastDao.java
similarity index 84%
rename from app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastDao.java
rename to app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/ressource/StockForecastDao.java
index a260b50..7fa1baa 100644
--- a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastDao.java
+++ b/app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/ressource/StockForecastDao.java
@@ -1,9 +1,9 @@
-package pl.com.dddbyexamples.factory.stock.forecast.ressource;
+package io.dddbyexamples.factory.stock.forecast.ressource;
 
+import io.dddbyexamples.tools.ProjectionRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.data.rest.core.config.Projection;
 import org.springframework.stereotype.Repository;
-import pl.com.dddbyexamples.tools.ProjectionRepository;
 
 @Repository
 @RepositoryRestResource(path = "stock-forecasts",
diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastEntity.java b/app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/ressource/StockForecastEntity.java
similarity index 80%
rename from app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastEntity.java
rename to app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/ressource/StockForecastEntity.java
index 959fb97..29cc80d 100644
--- a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastEntity.java
+++ b/app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/ressource/StockForecastEntity.java
@@ -1,9 +1,9 @@
-package pl.com.dddbyexamples.factory.stock.forecast.ressource;
+package io.dddbyexamples.factory.stock.forecast.ressource;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import pl.com.dddbyexamples.factory.stock.forecast.StockForecast;
+import io.dddbyexamples.factory.stock.forecast.StockForecast;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastResourceProcessor.java b/app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/ressource/StockForecastResourceProcessor.java
similarity index 76%
rename from app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastResourceProcessor.java
rename to app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/ressource/StockForecastResourceProcessor.java
index 36473e2..e751bf5 100644
--- a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/stock/forecast/ressource/StockForecastResourceProcessor.java
+++ b/app-monolith/src/main/java/io/dddbyexamples/factory/stock/forecast/ressource/StockForecastResourceProcessor.java
@@ -1,11 +1,11 @@
-package pl.com.dddbyexamples.factory.stock.forecast.ressource;
+package io.dddbyexamples.factory.stock.forecast.ressource;
 
 import lombok.AllArgsConstructor;
 import org.springframework.hateoas.Resource;
 import org.springframework.hateoas.ResourceProcessor;
 import org.springframework.stereotype.Component;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-import pl.com.dddbyexamples.factory.stock.forecast.StockForecastQuery;
+import io.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.factory.stock.forecast.StockForecastQuery;
 
 @Component
 @AllArgsConstructor
diff --git a/app-monolith/src/main/java/io/dddbyexamples/factory/warehouse/WarehouseService.java b/app-monolith/src/main/java/io/dddbyexamples/factory/warehouse/WarehouseService.java
new file mode 100644
index 0000000..2471777
--- /dev/null
+++ b/app-monolith/src/main/java/io/dddbyexamples/factory/warehouse/WarehouseService.java
@@ -0,0 +1,8 @@
+package io.dddbyexamples.factory.warehouse;
+
+import io.dddbyexamples.factory.shortages.prediction.calculation.Stock;
+import io.dddbyexamples.factory.product.management.RefNoId;
+
+public interface WarehouseService {
+    Stock forRefNo(RefNoId refNo);
+}
diff --git a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/warehouse/WarehouseService.java b/app-monolith/src/main/java/pl/com/dddbyexamples/factory/warehouse/WarehouseService.java
deleted file mode 100644
index 7f53cae..0000000
--- a/app-monolith/src/main/java/pl/com/dddbyexamples/factory/warehouse/WarehouseService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package pl.com.dddbyexamples.factory.warehouse;
-
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.Stock;
-
-public interface WarehouseService {
-    Stock forRefNo(RefNoId refNo);
-}
diff --git a/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/ProductTrait.groovy b/app-monolith/src/test/groovy/io/dddbyexamples/factory/ProductTrait.groovy
similarity index 65%
rename from app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/ProductTrait.groovy
rename to app-monolith/src/test/groovy/io/dddbyexamples/factory/ProductTrait.groovy
index 9bd98b0..c626acf 100644
--- a/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/ProductTrait.groovy
+++ b/app-monolith/src/test/groovy/io/dddbyexamples/factory/ProductTrait.groovy
@@ -1,13 +1,13 @@
-package pl.com.dddbyexamples.factory
+package io.dddbyexamples.factory
 
-import pl.com.dddbyexamples.factory.demand.forecasting.AdjustDemand
-import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand
-import pl.com.dddbyexamples.factory.demand.forecasting.Document
-import pl.com.dddbyexamples.factory.demand.forecasting.command.DemandAdjustmentEntity
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity
-import pl.com.dddbyexamples.factory.product.management.ProductDescription
-import pl.com.dddbyexamples.factory.product.management.ProductDescriptionEntity
+import io.dddbyexamples.factory.demand.forecasting.AdjustDemand
+import io.dddbyexamples.factory.demand.forecasting.Adjustment
+import io.dddbyexamples.factory.demand.forecasting.Demand
+import io.dddbyexamples.factory.demand.forecasting.Document
+import io.dddbyexamples.factory.demand.forecasting.command.DemandAdjustmentEntity
+import io.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity
+import io.dddbyexamples.factory.product.management.ProductDescription
+import io.dddbyexamples.factory.product.management.ProductDescriptionEntity
 
 import java.time.Instant
 import java.time.LocalDate
diff --git a/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/CallOffDocumentIntegrationSpec.groovy b/app-monolith/src/test/groovy/io/dddbyexamples/factory/integration/CallOffDocumentIntegrationSpec.groovy
similarity index 88%
rename from app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/CallOffDocumentIntegrationSpec.groovy
rename to app-monolith/src/test/groovy/io/dddbyexamples/factory/integration/CallOffDocumentIntegrationSpec.groovy
index 70870d2..b558caf 100644
--- a/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/CallOffDocumentIntegrationSpec.groovy
+++ b/app-monolith/src/test/groovy/io/dddbyexamples/factory/integration/CallOffDocumentIntegrationSpec.groovy
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.integration
+package io.dddbyexamples.factory.integration
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
@@ -9,12 +9,12 @@ import org.springframework.core.ParameterizedTypeReference
 import org.springframework.hateoas.Resources
 import org.springframework.http.HttpMethod
 import org.springframework.http.ResponseEntity
-import pl.com.dddbyexamples.factory.AppConfiguration
-import pl.com.dddbyexamples.factory.ProductTrait
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity
-import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity
-import pl.com.dddbyexamples.factory.product.management.ProductDescriptionEntity
-import pl.com.dddbyexamples.tools.IntegrationTest
+import io.dddbyexamples.factory.AppConfiguration
+import io.dddbyexamples.factory.ProductTrait
+import io.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity
+import io.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity
+import io.dddbyexamples.factory.product.management.ProductDescriptionEntity
+import io.dddbyexamples.tools.IntegrationTest
 import spock.lang.Specification
 
 import java.time.Clock
diff --git a/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/DemandAdjustmentIntegrationSpec.groovy b/app-monolith/src/test/groovy/io/dddbyexamples/factory/integration/DemandAdjustmentIntegrationSpec.groovy
similarity index 83%
rename from app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/DemandAdjustmentIntegrationSpec.groovy
rename to app-monolith/src/test/groovy/io/dddbyexamples/factory/integration/DemandAdjustmentIntegrationSpec.groovy
index 9ff7a98..0cbef43 100644
--- a/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/DemandAdjustmentIntegrationSpec.groovy
+++ b/app-monolith/src/test/groovy/io/dddbyexamples/factory/integration/DemandAdjustmentIntegrationSpec.groovy
@@ -1,8 +1,7 @@
-package pl.com.dddbyexamples.factory.integration
+package io.dddbyexamples.factory.integration
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.context.TestConfiguration
 import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -10,20 +9,19 @@ import org.springframework.core.ParameterizedTypeReference
 import org.springframework.hateoas.Resources
 import org.springframework.http.HttpMethod
 import org.springframework.http.ResponseEntity
-import pl.com.dddbyexamples.factory.AppConfiguration
-import pl.com.dddbyexamples.factory.ProductTrait
-import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand
-import pl.com.dddbyexamples.factory.demand.forecasting.command.DemandAdjustmentEntity
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity
-import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity
-import pl.com.dddbyexamples.factory.product.management.ProductDescriptionEntity
-import pl.com.dddbyexamples.tools.IntegrationTest
+import io.dddbyexamples.factory.AppConfiguration
+import io.dddbyexamples.factory.ProductTrait
+import io.dddbyexamples.factory.demand.forecasting.Adjustment
+import io.dddbyexamples.factory.demand.forecasting.Demand
+import io.dddbyexamples.factory.demand.forecasting.command.DemandAdjustmentEntity
+import io.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity
+import io.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity
+import io.dddbyexamples.factory.product.management.ProductDescriptionEntity
+import io.dddbyexamples.tools.IntegrationTest
 import spock.lang.Specification
 
 import java.time.Clock
 import java.time.LocalDate
-import java.time.ZoneId
 
 import static java.time.Instant.from
 import static java.time.ZoneId.systemDefault
diff --git a/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/ShortageIntegrationSpec.groovy b/app-monolith/src/test/groovy/io/dddbyexamples/factory/integration/ShortageIntegrationSpec.groovy
similarity index 77%
rename from app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/ShortageIntegrationSpec.groovy
rename to app-monolith/src/test/groovy/io/dddbyexamples/factory/integration/ShortageIntegrationSpec.groovy
index 1e41efd..1ef92f7 100644
--- a/app-monolith/src/test/groovy/pl/com/dddbyexamples/factory/integration/ShortageIntegrationSpec.groovy
+++ b/app-monolith/src/test/groovy/io/dddbyexamples/factory/integration/ShortageIntegrationSpec.groovy
@@ -1,33 +1,29 @@
-package pl.com.dddbyexamples.factory.integration
+package io.dddbyexamples.factory.integration
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Primary
 import org.springframework.core.ParameterizedTypeReference
 import org.springframework.hateoas.Resource
-import org.springframework.hateoas.Resources
 import org.springframework.http.HttpMethod
 import org.springframework.http.ResponseEntity
-import pl.com.dddbyexamples.factory.AppConfiguration
-import pl.com.dddbyexamples.factory.ProductTrait
-import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand
-import pl.com.dddbyexamples.factory.demand.forecasting.command.DemandAdjustmentEntity
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity
-import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity
-import pl.com.dddbyexamples.factory.product.management.ProductDescriptionEntity
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.Stock
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesEntity
-import pl.com.dddbyexamples.factory.warehouse.WarehouseService
-import pl.com.dddbyexamples.tools.IntegrationTest
+import io.dddbyexamples.factory.AppConfiguration
+import io.dddbyexamples.factory.ProductTrait
+import io.dddbyexamples.factory.demand.forecasting.Adjustment
+import io.dddbyexamples.factory.demand.forecasting.Demand
+import io.dddbyexamples.factory.demand.forecasting.command.DemandAdjustmentEntity
+import io.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity
+import io.dddbyexamples.factory.product.management.ProductDescriptionEntity
+import io.dddbyexamples.factory.shortages.prediction.calculation.Stock
+import io.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesEntity
+import io.dddbyexamples.factory.warehouse.WarehouseService
+import io.dddbyexamples.tools.IntegrationTest
 import spock.lang.Specification
 
 import java.time.Clock
 import java.time.LocalDate
-import java.time.ZoneId
 
 import static java.time.Instant.from
 import static java.time.ZoneId.systemDefault
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java
similarity index 66%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java
index 51d2698..b2e3328 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerORMRepository.java
@@ -1,14 +1,12 @@
-package pl.com.dddbyexamples.factory.delivery.planning;
+package io.dddbyexamples.factory.delivery.planning;
 
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
-import pl.com.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionDao;
-import pl.com.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionEntity;
+import io.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionDao;
+import io.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionEntity;
 
 import java.util.Collections;
 
-import static java.util.Optional.ofNullable;
-
 @Component
 @AllArgsConstructor
 public class DeliveryAutoPlannerORMRepository {
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinition.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinition.java
similarity index 87%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinition.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinition.java
index 4e657d9..2387171 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinition.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinition.java
@@ -1,10 +1,10 @@
-package pl.com.dddbyexamples.factory.delivery.planning.definition;
+package io.dddbyexamples.factory.delivery.planning.definition;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Singular;
 import lombok.Value;
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand;
+import io.dddbyexamples.factory.demand.forecasting.Demand;
 
 import java.time.LocalTime;
 import java.util.Collections;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionDao.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionDao.java
similarity index 87%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionDao.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionDao.java
index 197143e..95ccd4b 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionDao.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionDao.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.delivery.planning.definition;
+package io.dddbyexamples.factory.delivery.planning.definition;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEntity.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEntity.java
similarity index 88%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEntity.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEntity.java
index d945752..2aaeb53 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEntity.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/definition/DeliveryPlannerDefinitionEntity.java
@@ -1,8 +1,8 @@
-package pl.com.dddbyexamples.factory.delivery.planning.definition;
+package io.dddbyexamples.factory.delivery.planning.definition;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import pl.com.dddbyexamples.tools.JsonConverter;
+import io.dddbyexamples.tools.JsonConverter;
 
 import javax.persistence.Convert;
 import javax.persistence.Entity;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastDao.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastDao.java
similarity index 87%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastDao.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastDao.java
index fc2c272..7304b49 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastDao.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastDao.java
@@ -1,9 +1,9 @@
-package pl.com.dddbyexamples.factory.delivery.planning.projection;
+package io.dddbyexamples.factory.delivery.planning.projection;
 
+import io.dddbyexamples.tools.ProjectionRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.data.rest.core.annotation.RestResource;
 import org.springframework.stereotype.Repository;
-import pl.com.dddbyexamples.tools.ProjectionRepository;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastEntity.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastEntity.java
similarity index 92%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastEntity.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastEntity.java
index e2ed5fe..854c6eb 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastEntity.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastEntity.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.delivery.planning.projection;
+package io.dddbyexamples.factory.delivery.planning.projection;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastProjection.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastProjection.java
similarity index 79%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastProjection.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastProjection.java
index 57d8d5c..9f74bb1 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastProjection.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/delivery/planning/projection/DeliveryForecastProjection.java
@@ -1,13 +1,13 @@
-package pl.com.dddbyexamples.factory.delivery.planning.projection;
+package io.dddbyexamples.factory.delivery.planning.projection;
 
+import io.dddbyexamples.factory.delivery.planning.DeliveryAutoPlanner;
+import io.dddbyexamples.factory.delivery.planning.DeliveryAutoPlannerORMRepository;
+import io.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged;
+import io.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandDao;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
-import pl.com.dddbyexamples.factory.delivery.planning.DeliveryAutoPlanner;
-import pl.com.dddbyexamples.factory.delivery.planning.DeliveryAutoPlannerORMRepository;
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand;
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged;
-import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandDao;
-import pl.com.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity;
+import io.dddbyexamples.factory.demand.forecasting.Demand;
+import io.dddbyexamples.factory.demand.forecasting.projection.CurrentDemandEntity;
 
 import java.time.Clock;
 import java.time.LocalDate;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandForecastingConfiguration.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandForecastingConfiguration.java
similarity index 89%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandForecastingConfiguration.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandForecastingConfiguration.java
index c5bcaa4..db67665 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandForecastingConfiguration.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandForecastingConfiguration.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandValue.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandValue.java
similarity index 65%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandValue.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandValue.java
index d3804a7..ffbbe57 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandValue.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandValue.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.Value;
 
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepository.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepository.java
similarity index 86%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepository.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepository.java
index 0a68f83..8143ea7 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepository.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepository.java
@@ -1,13 +1,13 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
+import io.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandDao;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DemandDao;
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DemandEntity;
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandDao;
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandEntity;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-import pl.com.dddbyexamples.tools.TechnicalId;
+import io.dddbyexamples.factory.demand.forecasting.persistence.DemandDao;
+import io.dddbyexamples.factory.demand.forecasting.persistence.DemandEntity;
+import io.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandEntity;
+import io.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.tools.TechnicalId;
 
 import javax.persistence.EntityManager;
 import javax.persistence.LockModeType;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/CommandsHandler.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/CommandsHandler.java
similarity index 90%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/CommandsHandler.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/CommandsHandler.java
index 7b2f1dd..55bb5f6 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/CommandsHandler.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/CommandsHandler.java
@@ -1,5 +1,6 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.command;
+package io.dddbyexamples.factory.demand.forecasting.command;
 
+import io.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity;
 import lombok.AllArgsConstructor;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
@@ -10,8 +11,7 @@ import org.springframework.data.rest.core.annotation.RepositoryEventHandler;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandService;
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DocumentEntity;
+import io.dddbyexamples.factory.demand.forecasting.DemandService;
 
 import java.time.Clock;
 import java.time.LocalDate;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentDao.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentDao.java
similarity index 83%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentDao.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentDao.java
index 5f935c5..6025da1 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentDao.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentDao.java
@@ -1,9 +1,9 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.command;
+package io.dddbyexamples.factory.demand.forecasting.command;
 
+import io.dddbyexamples.tools.CommandRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.data.rest.core.annotation.RestResource;
 import org.springframework.stereotype.Repository;
-import pl.com.dddbyexamples.tools.CommandRepository;
 
 import java.time.LocalDate;
 
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentEntity.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentEntity.java
similarity index 84%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentEntity.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentEntity.java
index 5ed7cf0..d2d8662 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentEntity.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/DemandAdjustmentEntity.java
@@ -1,10 +1,10 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.command;
+package io.dddbyexamples.factory.demand.forecasting.command;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import pl.com.dddbyexamples.factory.demand.forecasting.AdjustDemand;
-import pl.com.dddbyexamples.tools.JsonConverter;
+import io.dddbyexamples.factory.demand.forecasting.AdjustDemand;
+import io.dddbyexamples.tools.JsonConverter;
 
 import javax.persistence.*;
 import java.io.Serializable;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/RequiredReviewDao.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/RequiredReviewDao.java
similarity index 86%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/RequiredReviewDao.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/RequiredReviewDao.java
index 2f529d9..7053fd5 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/RequiredReviewDao.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/RequiredReviewDao.java
@@ -1,9 +1,9 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.command;
+package io.dddbyexamples.factory.demand.forecasting.command;
 
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.data.rest.core.annotation.RestResource;
 import org.springframework.stereotype.Repository;
-import pl.com.dddbyexamples.tools.CommandRepository;
+import io.dddbyexamples.tools.CommandRepository;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/RequiredReviewEntity.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/RequiredReviewEntity.java
similarity index 78%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/RequiredReviewEntity.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/RequiredReviewEntity.java
index f14ae1a..842ed05 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/command/RequiredReviewEntity.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/command/RequiredReviewEntity.java
@@ -1,12 +1,12 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.command;
+package io.dddbyexamples.factory.demand.forecasting.command;
 
+import io.dddbyexamples.factory.demand.forecasting.ApplyReviewDecision;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import pl.com.dddbyexamples.factory.demand.forecasting.ApplyReviewDecision;
-import pl.com.dddbyexamples.factory.demand.forecasting.ReviewDecision;
-import pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired.ToReview;
-import pl.com.dddbyexamples.tools.JsonConverter;
+import io.dddbyexamples.factory.demand.forecasting.ReviewDecision;
+import io.dddbyexamples.factory.demand.forecasting.ReviewRequired.ToReview;
+import io.dddbyexamples.tools.JsonConverter;
 
 import javax.persistence.*;
 import java.io.Serializable;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DemandDao.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/DemandDao.java
similarity index 86%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DemandDao.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/DemandDao.java
index 322def1..96abb42 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DemandDao.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/DemandDao.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.persistence;
+package io.dddbyexamples.factory.demand.forecasting.persistence;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.core.annotation.RestResource;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DemandEntity.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/DemandEntity.java
similarity index 81%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DemandEntity.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/DemandEntity.java
index 08bdda9..48a3dff 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DemandEntity.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/DemandEntity.java
@@ -1,12 +1,12 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.persistence;
+package io.dddbyexamples.factory.demand.forecasting.persistence;
 
+import io.dddbyexamples.factory.demand.forecasting.DailyId;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import pl.com.dddbyexamples.factory.demand.forecasting.DailyId;
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandValue;
-import pl.com.dddbyexamples.tools.JsonConverter;
-import pl.com.dddbyexamples.tools.TechnicalId;
+import io.dddbyexamples.factory.demand.forecasting.DemandValue;
+import io.dddbyexamples.tools.JsonConverter;
+import io.dddbyexamples.tools.TechnicalId;
 
 import javax.persistence.*;
 import java.io.Serializable;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DocumentDao.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/DocumentDao.java
similarity index 75%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DocumentDao.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/DocumentDao.java
index 5c4bf58..44f2c42 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DocumentDao.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/DocumentDao.java
@@ -1,8 +1,8 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.persistence;
+package io.dddbyexamples.factory.demand.forecasting.persistence;
 
+import io.dddbyexamples.tools.CommandRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.stereotype.Repository;
-import pl.com.dddbyexamples.tools.CommandRepository;
 
 @Repository("documentDao")
 @RepositoryRestResource(path = "demand-documents",
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DocumentEntity.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/DocumentEntity.java
similarity index 86%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DocumentEntity.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/DocumentEntity.java
index 76965d1..17029d5 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/DocumentEntity.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/DocumentEntity.java
@@ -1,11 +1,11 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.persistence;
+package io.dddbyexamples.factory.demand.forecasting.persistence;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.springframework.data.annotation.LastModifiedDate;
-import pl.com.dddbyexamples.factory.demand.forecasting.Document;
-import pl.com.dddbyexamples.tools.JsonConverter;
+import io.dddbyexamples.factory.demand.forecasting.Document;
+import io.dddbyexamples.tools.JsonConverter;
 
 import javax.persistence.*;
 import java.io.Serializable;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandDao.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandDao.java
similarity index 85%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandDao.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandDao.java
index af59cb9..1cf1b4c 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandDao.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandDao.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.persistence;
+package io.dddbyexamples.factory.demand.forecasting.persistence;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.core.annotation.RestResource;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandEntity.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandEntity.java
similarity index 81%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandEntity.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandEntity.java
index f821841..3580b9d 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandEntity.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/persistence/ProductDemandEntity.java
@@ -1,9 +1,9 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.persistence;
+package io.dddbyexamples.factory.demand.forecasting.persistence;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-import pl.com.dddbyexamples.tools.TechnicalId;
+import io.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.tools.TechnicalId;
 
 import javax.persistence.*;
 import java.io.Serializable;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandDao.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandDao.java
similarity index 88%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandDao.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandDao.java
index f85d614..b2b4b43 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandDao.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandDao.java
@@ -1,11 +1,11 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.projection;
+package io.dddbyexamples.factory.demand.forecasting.projection;
 
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.data.rest.core.annotation.RestResource;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Repository;
-import pl.com.dddbyexamples.tools.ProjectionRepository;
+import io.dddbyexamples.tools.ProjectionRepository;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandEntity.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandEntity.java
similarity index 86%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandEntity.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandEntity.java
index d4a351d..ec70a63 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandEntity.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandEntity.java
@@ -1,8 +1,8 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.projection;
+package io.dddbyexamples.factory.demand.forecasting.projection;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand;
+import io.dddbyexamples.factory.demand.forecasting.Demand;
 
 import javax.persistence.*;
 import java.io.Serializable;
diff --git a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandProjection.java b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandProjection.java
similarity index 82%
rename from demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandProjection.java
rename to demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandProjection.java
index c7f9ebb..a4b063c 100644
--- a/demand-forecasting-adapters/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandProjection.java
+++ b/demand-forecasting-adapters/src/main/java/io/dddbyexamples/factory/demand/forecasting/projection/CurrentDemandProjection.java
@@ -1,9 +1,9 @@
-package pl.com.dddbyexamples.factory.demand.forecasting.projection;
+package io.dddbyexamples.factory.demand.forecasting.projection;
 
+import io.dddbyexamples.factory.demand.forecasting.DailyId;
+import io.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
-import pl.com.dddbyexamples.factory.demand.forecasting.DailyId;
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged;
 
 @Component
 @AllArgsConstructor
diff --git a/demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java b/demand-forecasting-adapters/src/test/groovy/io/dddbyexamples/factory/Configuration.java
similarity index 78%
rename from demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java
rename to demand-forecasting-adapters/src/test/groovy/io/dddbyexamples/factory/Configuration.java
index 4d1dabb..0d5499c 100644
--- a/demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java
+++ b/demand-forecasting-adapters/src/test/groovy/io/dddbyexamples/factory/Configuration.java
@@ -1,13 +1,13 @@
-package pl.com.dddbyexamples.factory;
+package io.dddbyexamples.factory;
 
+import io.dddbyexamples.factory.demand.forecasting.DemandEvents;
+import io.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged;
+import io.dddbyexamples.factory.demand.forecasting.ReviewRequired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents;
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged;
-import pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired;
 
 import java.time.Clock;
 
diff --git a/demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveryPlannerDefinitionTest.groovy b/demand-forecasting-adapters/src/test/groovy/io/dddbyexamples/factory/delivery/planning/DeliveryPlannerDefinitionTest.groovy
similarity index 71%
rename from demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveryPlannerDefinitionTest.groovy
rename to demand-forecasting-adapters/src/test/groovy/io/dddbyexamples/factory/delivery/planning/DeliveryPlannerDefinitionTest.groovy
index c293bf0..b0de887 100644
--- a/demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveryPlannerDefinitionTest.groovy
+++ b/demand-forecasting-adapters/src/test/groovy/io/dddbyexamples/factory/delivery/planning/DeliveryPlannerDefinitionTest.groovy
@@ -1,15 +1,15 @@
-package pl.com.dddbyexamples.factory.delivery.planning
+package io.dddbyexamples.factory.delivery.planning
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import pl.com.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinition
-import pl.com.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionDao
-import pl.com.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionEntity
+import io.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinition
+import io.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionDao
+import io.dddbyexamples.factory.delivery.planning.definition.DeliveryPlannerDefinitionEntity
 import spock.lang.Specification
 
 import static java.time.LocalTime.of as time
 import static DeliveryPlannerDefinition.of
-import static pl.com.dddbyexamples.factory.demand.forecasting.Demand.Schema.*
+import static io.dddbyexamples.factory.demand.forecasting.Demand.Schema.*
 
 @SpringBootTest
 class DeliveryPlannerDefinitionTest extends Specification {
diff --git a/demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepositoryTest.groovy b/demand-forecasting-adapters/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepositoryTest.groovy
similarity index 79%
rename from demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepositoryTest.groovy
rename to demand-forecasting-adapters/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepositoryTest.groovy
index f828f68..8ef4d29 100644
--- a/demand-forecasting-adapters/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepositoryTest.groovy
+++ b/demand-forecasting-adapters/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ProductDemandORMRepositoryTest.groovy
@@ -1,18 +1,12 @@
-package pl.com.dddbyexamples.factory.demand.forecasting
+package io.dddbyexamples.factory.demand.forecasting
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.annotation.Commit
-import pl.com.dddbyexamples.factory.demand.forecasting.AdjustDemand
-import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandValue
-import pl.com.dddbyexamples.factory.demand.forecasting.ReviewPolicy
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DemandDao
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.DemandEntity
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandDao
-import pl.com.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandEntity
+import io.dddbyexamples.factory.demand.forecasting.persistence.DemandDao
+import io.dddbyexamples.factory.demand.forecasting.persistence.DemandEntity
+import io.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandDao
+import io.dddbyexamples.factory.demand.forecasting.persistence.ProductDemandEntity
 import spock.lang.Specification
 
 import javax.persistence.EntityManager
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveriesSuggestion.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/delivery/planning/DeliveriesSuggestion.java
similarity index 86%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveriesSuggestion.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/delivery/planning/DeliveriesSuggestion.java
index df161ed..a28925b 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveriesSuggestion.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/delivery/planning/DeliveriesSuggestion.java
@@ -1,6 +1,6 @@
-package pl.com.dddbyexamples.factory.delivery.planning;
+package io.dddbyexamples.factory.delivery.planning;
 
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand;
+import io.dddbyexamples.factory.demand.forecasting.Demand;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/Delivery.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/delivery/planning/Delivery.java
similarity index 72%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/Delivery.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/delivery/planning/Delivery.java
index 6af8234..cdc54b7 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/Delivery.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/delivery/planning/Delivery.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.delivery.planning;
+package io.dddbyexamples.factory.delivery.planning;
 
 import lombok.Value;
 
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlanner.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/delivery/planning/DeliveryAutoPlanner.java
similarity index 80%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlanner.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/delivery/planning/DeliveryAutoPlanner.java
index daea59f..e40e2a5 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlanner.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/delivery/planning/DeliveryAutoPlanner.java
@@ -1,7 +1,7 @@
-package pl.com.dddbyexamples.factory.delivery.planning;
+package io.dddbyexamples.factory.delivery.planning;
 
 import lombok.AllArgsConstructor;
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand;
+import io.dddbyexamples.factory.demand.forecasting.Demand;
 
 import java.time.LocalDate;
 import java.util.Map;
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/AdjustDemand.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/AdjustDemand.java
similarity index 87%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/AdjustDemand.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/AdjustDemand.java
index fd2b8cf..030f8a1 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/AdjustDemand.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/AdjustDemand.java
@@ -1,7 +1,7 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.Value;
-import pl.com.dddbyexamples.factory.demand.forecasting.DailyDemand.Result;
+import io.dddbyexamples.factory.demand.forecasting.DailyDemand.Result;
 
 import java.time.LocalDate;
 import java.util.Comparator;
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Adjustment.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/Adjustment.java
similarity index 89%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Adjustment.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/Adjustment.java
index 5cff0bc..5fdef69 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Adjustment.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/Adjustment.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.Value;
 
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ApplyReviewDecision.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ApplyReviewDecision.java
similarity index 91%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ApplyReviewDecision.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ApplyReviewDecision.java
index dbefcab..4b10ad0 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ApplyReviewDecision.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ApplyReviewDecision.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.Value;
 
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemand.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DailyDemand.java
similarity index 93%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemand.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DailyDemand.java
index 922c4d3..2662d55 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemand.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DailyDemand.java
@@ -1,8 +1,7 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.Builder;
 import lombok.Value;
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged.Change;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -95,8 +94,8 @@ class DailyDemand {
                     || !Objects.equals(this.adjustment, DailyDemand.this.adjustment);
         }
 
-        Change getLevelChange() {
-            return new Change(level, getLevel());
+        DemandedLevelsChanged.Change getLevelChange() {
+            return new DemandedLevelsChanged.Change(level, getLevel());
         }
 
         boolean levelChanged() {
@@ -123,7 +122,7 @@ class DailyDemand {
                     .collect(Collectors.toList()));
         }
 
-        static Map<DailyId, Change> levelChanges(List<Result> results) {
+        static Map<DailyId, DemandedLevelsChanged.Change> levelChanges(List<Result> results) {
             return Collections.unmodifiableMap(results.stream()
                     .filter(result -> result.levelChange != null)
                     .collect(Collectors.toMap(
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEvents.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandEvents.java
similarity index 67%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEvents.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandEvents.java
index 6d07be5..f2a4dad 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandEvents.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandEvents.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 public interface DemandEvents {
     void emit(DemandedLevelsChanged event);
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandService.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandService.java
similarity index 93%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandService.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandService.java
index b1f6ce8..b09ceda 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandService.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandService.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.AllArgsConstructor;
 
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Demands.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/Demands.java
similarity index 87%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Demands.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/Demands.java
index b9a9b97..fd3205d 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Demands.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/Demands.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import java.time.LocalDate;
 import java.util.HashMap;
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Document.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/Document.java
similarity index 92%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Document.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/Document.java
index 52e6ae0..989c1e8 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Document.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/Document.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.Value;
 
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemand.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ProductDemand.java
similarity index 83%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemand.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ProductDemand.java
index fe5e3dd..f835fef 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemand.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ProductDemand.java
@@ -1,8 +1,7 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.AllArgsConstructor;
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged.Change;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.factory.product.management.RefNoId;
 
 import java.time.Clock;
 import java.time.LocalDate;
@@ -30,7 +29,7 @@ class ProductDemand {
                 .forEachStartingFrom(today, this::adjustDaily);
         updates.addAll(DailyDemand.Result.updates(results));
 
-        Map<DailyId, Change> changes = DailyDemand.Result.levelChanges(results);
+        Map<DailyId, DemandedLevelsChanged.Change> changes = DailyDemand.Result.levelChanges(results);
 
         if (!changes.isEmpty()) {
             events.emit(new DemandedLevelsChanged(id, changes));
@@ -44,7 +43,7 @@ class ProductDemand {
                 .forEachStartingFrom(today, this::updateDaily);
         updates.addAll(DailyDemand.Result.updates(results));
 
-        Map<DailyId, Change> changes = DailyDemand.Result.levelChanges(results);
+        Map<DailyId, DemandedLevelsChanged.Change> changes = DailyDemand.Result.levelChanges(results);
 
         if (!changes.isEmpty()) {
             events.emit(new DemandedLevelsChanged(id, changes));
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandRepository.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ProductDemandRepository.java
similarity index 72%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandRepository.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ProductDemandRepository.java
index 5270670..2663b9c 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandRepository.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ProductDemandRepository.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 interface ProductDemandRepository {
     ProductDemand get(String refNo);
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewDecision.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ReviewDecision.java
similarity index 80%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewDecision.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ReviewDecision.java
index 3617531..ff3d1e9 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewDecision.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ReviewDecision.java
@@ -1,7 +1,7 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.AllArgsConstructor;
-import pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired.ToReview;
+import io.dddbyexamples.factory.demand.forecasting.ReviewRequired.ToReview;
 
 import java.util.function.Function;
 
diff --git a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicy.java b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ReviewPolicy.java
similarity index 88%
rename from demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicy.java
rename to demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ReviewPolicy.java
index b2bc640..08d75cf 100644
--- a/demand-forecasting-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicy.java
+++ b/demand-forecasting-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ReviewPolicy.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 public interface ReviewPolicy {
 
diff --git a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveriesSuggestionSpec.groovy b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/delivery/planning/DeliveriesSuggestionSpec.groovy
similarity index 91%
rename from demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveriesSuggestionSpec.groovy
rename to demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/delivery/planning/DeliveriesSuggestionSpec.groovy
index 756cac8..ab9aeb6 100644
--- a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveriesSuggestionSpec.groovy
+++ b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/delivery/planning/DeliveriesSuggestionSpec.groovy
@@ -1,7 +1,6 @@
-package pl.com.dddbyexamples.factory.delivery.planning
+package io.dddbyexamples.factory.delivery.planning
 
-import pl.com.dddbyexamples.factory.delivery.planning.Delivery
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand
+import io.dddbyexamples.factory.demand.forecasting.Demand
 import spock.lang.PendingFeature
 import spock.lang.Specification
 
@@ -10,7 +9,7 @@ import java.time.LocalDateTime
 import java.time.LocalTime
 import java.util.stream.Collectors
 
-import static pl.com.dddbyexamples.factory.demand.forecasting.Demand.Schema.AtDayStart
+import static io.dddbyexamples.factory.demand.forecasting.Demand.Schema.AtDayStart
 
 class DeliveriesSuggestionSpec extends Specification {
 
diff --git a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerSpec.groovy b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerSpec.groovy
similarity index 76%
rename from demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerSpec.groovy
rename to demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerSpec.groovy
index 1453bfb..a09fc30 100644
--- a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerSpec.groovy
+++ b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/delivery/planning/DeliveryAutoPlannerSpec.groovy
@@ -1,8 +1,6 @@
-package pl.com.dddbyexamples.factory.delivery.planning
+package io.dddbyexamples.factory.delivery.planning
 
-import pl.com.dddbyexamples.factory.delivery.planning.Delivery
-import pl.com.dddbyexamples.factory.delivery.planning.DeliveryAutoPlanner
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand
+import io.dddbyexamples.factory.demand.forecasting.Demand
 import spock.lang.Specification
 
 import java.time.LocalDate
@@ -10,8 +8,8 @@ import java.time.LocalDateTime
 import java.time.LocalTime
 import java.util.stream.Collectors
 
-import static pl.com.dddbyexamples.factory.delivery.planning.DeliveriesSuggestion.timesAndFractions
-import static pl.com.dddbyexamples.factory.demand.forecasting.Demand.Schema.AtDayStart
+import static DeliveriesSuggestion.timesAndFractions
+import static io.dddbyexamples.factory.demand.forecasting.Demand.Schema.AtDayStart
 
 class DeliveryAutoPlannerSpec extends Specification {
 
diff --git a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemandBuilder.groovy b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DailyDemandBuilder.groovy
similarity index 71%
rename from demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemandBuilder.groovy
rename to demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DailyDemandBuilder.groovy
index eaf0116..644f86c 100644
--- a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DailyDemandBuilder.groovy
+++ b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DailyDemandBuilder.groovy
@@ -1,18 +1,10 @@
-package pl.com.dddbyexamples.factory.demand.forecasting
-
-import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment
-import pl.com.dddbyexamples.factory.demand.forecasting.DailyId
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand
-import pl.com.dddbyexamples.factory.demand.forecasting.ReviewPolicy
+package io.dddbyexamples.factory.demand.forecasting
 
 import java.time.Clock
 import java.time.Instant
 import java.time.LocalDate
 import java.time.ZoneId
 
-import static pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged.Change
-import static pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired.ToReview
-
 class DailyDemandBuilder {
 
     Clock clock = Clock.fixed(Instant.now(), ZoneId.systemDefault())
@@ -84,12 +76,12 @@ class DailyDemandBuilder {
         new Adjustment(Demand.of(level), false)
     }
 
-    Change levelChanged(long previous, long current) {
-        new Change(Demand.of(previous), Demand.of(current))
+    DemandedLevelsChanged.Change levelChanged(long previous, long current) {
+        new DemandedLevelsChanged.Change(Demand.of(previous), Demand.of(current))
     }
 
-    ToReview reviewRequest(long previousDocumented, long adjustment, long newDocumented) {
-        new ToReview(
+    ReviewRequired.ToReview reviewRequest(long previousDocumented, long adjustment, long newDocumented) {
+        new ReviewRequired.ToReview(
                 new DailyId(refNo, date),
                 Demand.of(previousDocumented),
                 Demand.of(adjustment),
diff --git a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandAdjustmentSpec.groovy b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DemandAdjustmentSpec.groovy
similarity index 91%
rename from demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandAdjustmentSpec.groovy
rename to demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DemandAdjustmentSpec.groovy
index 8667145..c8224ca 100644
--- a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandAdjustmentSpec.groovy
+++ b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DemandAdjustmentSpec.groovy
@@ -1,7 +1,5 @@
-package pl.com.dddbyexamples.factory.demand.forecasting
+package io.dddbyexamples.factory.demand.forecasting
 
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged
 import spock.lang.Specification
 
 import java.time.LocalDate
diff --git a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandServiceSpec.groovy b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DemandServiceSpec.groovy
similarity index 86%
rename from demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandServiceSpec.groovy
rename to demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DemandServiceSpec.groovy
index 3c266ea..5684332 100644
--- a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandServiceSpec.groovy
+++ b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DemandServiceSpec.groovy
@@ -1,12 +1,10 @@
-package pl.com.dddbyexamples.factory.demand.forecasting
+package io.dddbyexamples.factory.demand.forecasting
 
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandService
 import spock.lang.Specification
 
 import java.time.LocalDate
 
-import static pl.com.dddbyexamples.factory.demand.forecasting.ReviewDecision.PICK_NEW
+import static ReviewDecision.PICK_NEW
 
 class DemandServiceSpec extends Specification implements ProductDemandTrait {
 
diff --git a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandsFake.groovy b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DemandsFake.groovy
similarity index 95%
rename from demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandsFake.groovy
rename to demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DemandsFake.groovy
index c2a6b9d..3f5e5f2 100644
--- a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DemandsFake.groovy
+++ b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DemandsFake.groovy
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting
+package io.dddbyexamples.factory.demand.forecasting
 
 import java.time.Clock
 import java.time.LocalDate
diff --git a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DocumentProcessingSpec.groovy b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DocumentProcessingSpec.groovy
similarity index 91%
rename from demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DocumentProcessingSpec.groovy
rename to demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DocumentProcessingSpec.groovy
index 8fcd681..a3c45e2 100644
--- a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/DocumentProcessingSpec.groovy
+++ b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/DocumentProcessingSpec.groovy
@@ -1,7 +1,5 @@
-package pl.com.dddbyexamples.factory.demand.forecasting
+package io.dddbyexamples.factory.demand.forecasting
 
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged
 import spock.lang.Specification
 
 import java.time.LocalDate
diff --git a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/KeepingDailyDemandsSpec.groovy b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/KeepingDailyDemandsSpec.groovy
similarity index 93%
rename from demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/KeepingDailyDemandsSpec.groovy
rename to demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/KeepingDailyDemandsSpec.groovy
index d816d46..5c60a42 100644
--- a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/KeepingDailyDemandsSpec.groovy
+++ b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/KeepingDailyDemandsSpec.groovy
@@ -1,7 +1,5 @@
-package pl.com.dddbyexamples.factory.demand.forecasting
+package io.dddbyexamples.factory.demand.forecasting
 
-import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand
 import spock.lang.Specification
 
 class KeepingDailyDemandsSpec extends Specification {
diff --git a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandBuilder.groovy b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ProductDemandBuilder.groovy
similarity index 71%
rename from demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandBuilder.groovy
rename to demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ProductDemandBuilder.groovy
index 25e41e3..95430e7 100644
--- a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandBuilder.groovy
+++ b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ProductDemandBuilder.groovy
@@ -1,21 +1,10 @@
-package pl.com.dddbyexamples.factory.demand.forecasting
+package io.dddbyexamples.factory.demand.forecasting
 
-import pl.com.dddbyexamples.factory.demand.forecasting.AdjustDemand
-import pl.com.dddbyexamples.factory.demand.forecasting.Adjustment
-import pl.com.dddbyexamples.factory.demand.forecasting.ApplyReviewDecision
-import pl.com.dddbyexamples.factory.demand.forecasting.DailyId
-import pl.com.dddbyexamples.factory.demand.forecasting.Demand
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged
-import pl.com.dddbyexamples.factory.demand.forecasting.Document
-import pl.com.dddbyexamples.factory.demand.forecasting.ReviewDecision
-import pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired
-import pl.com.dddbyexamples.factory.product.management.RefNoId
+import io.dddbyexamples.factory.product.management.RefNoId
 
 import java.time.*
 
-import static pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged.Change
-import static pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired.ToReview
+import static ReviewRequired.ToReview
 
 class ProductDemandBuilder {
 
@@ -71,10 +60,10 @@ class ProductDemandBuilder {
 
     def levelChanged(List<Long>... changes) {
         def date = LocalDate.now(clock)
-        Map<DailyId, Change> results = new HashMap<>()
+        Map<DailyId, DemandedLevelsChanged.Change> results = new HashMap<>()
         for (def change : changes) {
             if (change.size() == 2) {
-                results.put(new DailyId(refNo, date), new Change(
+                results.put(new DailyId(refNo, date), new DemandedLevelsChanged.Change(
                         Demand.of(change[0]),
                         Demand.of(change[1])))
             } else if (!change.empty) throw new IllegalAccessException()
diff --git a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandTrait.groovy b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ProductDemandTrait.groovy
similarity index 66%
rename from demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandTrait.groovy
rename to demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ProductDemandTrait.groovy
index 5b5b27b..41187ea 100644
--- a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ProductDemandTrait.groovy
+++ b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ProductDemandTrait.groovy
@@ -1,15 +1,8 @@
-package pl.com.dddbyexamples.factory.demand.forecasting
-
-import pl.com.dddbyexamples.factory.demand.forecasting.AdjustDemand
-import pl.com.dddbyexamples.factory.demand.forecasting.ApplyReviewDecision
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged
-import pl.com.dddbyexamples.factory.demand.forecasting.Document
-import pl.com.dddbyexamples.factory.demand.forecasting.ReviewDecision
-import pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired
+package io.dddbyexamples.factory.demand.forecasting
 
 import java.time.LocalDate
 
-import static pl.com.dddbyexamples.factory.demand.forecasting.ReviewRequired.ToReview
+import static ReviewRequired.ToReview
 
 trait ProductDemandTrait {
 
diff --git a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicySpec.groovy b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ReviewPolicySpec.groovy
similarity index 79%
rename from demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicySpec.groovy
rename to demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ReviewPolicySpec.groovy
index 6a1e130..de22fa0 100644
--- a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ReviewPolicySpec.groovy
+++ b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ReviewPolicySpec.groovy
@@ -1,11 +1,10 @@
-package pl.com.dddbyexamples.factory.demand.forecasting
+package io.dddbyexamples.factory.demand.forecasting
 
-import pl.com.dddbyexamples.factory.demand.forecasting.ReviewPolicy
 import spock.lang.Specification
 
-import static pl.com.dddbyexamples.factory.demand.forecasting.Adjustment.strong
-import static pl.com.dddbyexamples.factory.demand.forecasting.Adjustment.weak
-import static pl.com.dddbyexamples.factory.demand.forecasting.Demand.of
+import static Adjustment.strong
+import static Adjustment.weak
+import static Demand.of
 
 class ReviewPolicySpec extends Specification {
 
diff --git a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ReviewProcessingSpec.groovy b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ReviewProcessingSpec.groovy
similarity index 90%
rename from demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ReviewProcessingSpec.groovy
rename to demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ReviewProcessingSpec.groovy
index fe2baa5..c19a57d 100644
--- a/demand-forecasting-model/src/test/groovy/pl/com/dddbyexamples/factory/demand/forecasting/ReviewProcessingSpec.groovy
+++ b/demand-forecasting-model/src/test/groovy/io/dddbyexamples/factory/demand/forecasting/ReviewProcessingSpec.groovy
@@ -1,12 +1,10 @@
-package pl.com.dddbyexamples.factory.demand.forecasting
+package io.dddbyexamples.factory.demand.forecasting
 
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandEvents
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged
 import spock.lang.Specification
 
 import java.time.LocalDate
 
-import static pl.com.dddbyexamples.factory.demand.forecasting.ReviewDecision.*
+import static ReviewDecision.*
 
 class ReviewProcessingSpec extends Specification implements ProductDemandTrait {
 
diff --git a/product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescription.java b/product-management-adapters/src/main/java/io/dddbyexamples/factory/product/management/ProductDescription.java
similarity index 70%
rename from product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescription.java
rename to product-management-adapters/src/main/java/io/dddbyexamples/factory/product/management/ProductDescription.java
index e96d263..9e53a8e 100644
--- a/product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescription.java
+++ b/product-management-adapters/src/main/java/io/dddbyexamples/factory/product/management/ProductDescription.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.product.management;
+package io.dddbyexamples.factory.product.management;
 
 import lombok.Value;
 
diff --git a/product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionDao.java b/product-management-adapters/src/main/java/io/dddbyexamples/factory/product/management/ProductDescriptionDao.java
similarity index 89%
rename from product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionDao.java
rename to product-management-adapters/src/main/java/io/dddbyexamples/factory/product/management/ProductDescriptionDao.java
index dbc1b4f..d9d46bb 100644
--- a/product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionDao.java
+++ b/product-management-adapters/src/main/java/io/dddbyexamples/factory/product/management/ProductDescriptionDao.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.product.management;
+package io.dddbyexamples.factory.product.management;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
diff --git a/product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEntity.java b/product-management-adapters/src/main/java/io/dddbyexamples/factory/product/management/ProductDescriptionEntity.java
similarity index 88%
rename from product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEntity.java
rename to product-management-adapters/src/main/java/io/dddbyexamples/factory/product/management/ProductDescriptionEntity.java
index c286a3c..f67e356 100644
--- a/product-management-adapters/src/main/java/pl/com/dddbyexamples/factory/product/management/ProductDescriptionEntity.java
+++ b/product-management-adapters/src/main/java/io/dddbyexamples/factory/product/management/ProductDescriptionEntity.java
@@ -1,8 +1,8 @@
-package pl.com.dddbyexamples.factory.product.management;
+package io.dddbyexamples.factory.product.management;
 
+import io.dddbyexamples.tools.JsonConverter;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import pl.com.dddbyexamples.tools.JsonConverter;
 
 import javax.persistence.Convert;
 import javax.persistence.Entity;
diff --git a/product-management-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java b/product-management-adapters/src/test/groovy/io/dddbyexamples/factory/Configuration.java
similarity index 94%
rename from product-management-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java
rename to product-management-adapters/src/test/groovy/io/dddbyexamples/factory/Configuration.java
index c5b50fb..aa89bf2 100644
--- a/product-management-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java
+++ b/product-management-adapters/src/test/groovy/io/dddbyexamples/factory/Configuration.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory;
+package io.dddbyexamples.factory;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
diff --git a/product-management-adapters/src/test/groovy/pl/com/dddbyexamples/factory/product/management/ProductDescriptionPersistenceTest.groovy b/product-management-adapters/src/test/groovy/io/dddbyexamples/factory/product/management/ProductDescriptionPersistenceTest.groovy
similarity index 75%
rename from product-management-adapters/src/test/groovy/pl/com/dddbyexamples/factory/product/management/ProductDescriptionPersistenceTest.groovy
rename to product-management-adapters/src/test/groovy/io/dddbyexamples/factory/product/management/ProductDescriptionPersistenceTest.groovy
index 069424f..78cc2a2 100644
--- a/product-management-adapters/src/test/groovy/pl/com/dddbyexamples/factory/product/management/ProductDescriptionPersistenceTest.groovy
+++ b/product-management-adapters/src/test/groovy/io/dddbyexamples/factory/product/management/ProductDescriptionPersistenceTest.groovy
@@ -1,10 +1,7 @@
-package pl.com.dddbyexamples.factory.product.management
+package io.dddbyexamples.factory.product.management
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import pl.com.dddbyexamples.factory.product.management.ProductDescription
-import pl.com.dddbyexamples.factory.product.management.ProductDescriptionDao
-import pl.com.dddbyexamples.factory.product.management.ProductDescriptionEntity
 import spock.lang.Specification
 
 import static java.util.Collections.singletonList
diff --git a/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputDao.java b/production-planning-adapters/src/main/java/io/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputDao.java
similarity index 84%
rename from production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputDao.java
rename to production-planning-adapters/src/main/java/io/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputDao.java
index 5980f5b..0d25ae4 100644
--- a/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputDao.java
+++ b/production-planning-adapters/src/main/java/io/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputDao.java
@@ -1,9 +1,9 @@
-package pl.com.dddbyexamples.factory.production.planning.projection;
+package io.dddbyexamples.factory.production.planning.projection;
 
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.data.rest.core.annotation.RestResource;
 import org.springframework.stereotype.Repository;
-import pl.com.dddbyexamples.tools.ProjectionRepository;
+import io.dddbyexamples.tools.ProjectionRepository;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputEntity.java b/production-planning-adapters/src/main/java/io/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputEntity.java
similarity index 91%
rename from production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputEntity.java
rename to production-planning-adapters/src/main/java/io/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputEntity.java
index cd557a1..9d3475b 100644
--- a/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputEntity.java
+++ b/production-planning-adapters/src/main/java/io/dddbyexamples/factory/production/planning/projection/ProductionDailyOutputEntity.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.production.planning.projection;
+package io.dddbyexamples.factory.production.planning.projection;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionOutputDao.java b/production-planning-adapters/src/main/java/io/dddbyexamples/factory/production/planning/projection/ProductionOutputDao.java
similarity index 84%
rename from production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionOutputDao.java
rename to production-planning-adapters/src/main/java/io/dddbyexamples/factory/production/planning/projection/ProductionOutputDao.java
index 011de24..9836c2c 100644
--- a/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionOutputDao.java
+++ b/production-planning-adapters/src/main/java/io/dddbyexamples/factory/production/planning/projection/ProductionOutputDao.java
@@ -1,9 +1,9 @@
-package pl.com.dddbyexamples.factory.production.planning.projection;
+package io.dddbyexamples.factory.production.planning.projection;
 
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.data.rest.core.annotation.RestResource;
 import org.springframework.stereotype.Repository;
-import pl.com.dddbyexamples.tools.ProjectionRepository;
+import io.dddbyexamples.tools.ProjectionRepository;
 
 import java.time.LocalDateTime;
 import java.util.List;
diff --git a/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionOutputEntity.java b/production-planning-adapters/src/main/java/io/dddbyexamples/factory/production/planning/projection/ProductionOutputEntity.java
similarity index 94%
rename from production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionOutputEntity.java
rename to production-planning-adapters/src/main/java/io/dddbyexamples/factory/production/planning/projection/ProductionOutputEntity.java
index 1acae5c..c8ba6ce 100644
--- a/production-planning-adapters/src/main/java/pl/com/dddbyexamples/factory/production/planning/projection/ProductionOutputEntity.java
+++ b/production-planning-adapters/src/main/java/io/dddbyexamples/factory/production/planning/projection/ProductionOutputEntity.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.production.planning.projection;
+package io.dddbyexamples.factory.production.planning.projection;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyId.java b/shared-kernel-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DailyId.java
similarity index 83%
rename from shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyId.java
rename to shared-kernel-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DailyId.java
index aa15695..34470f5 100644
--- a/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DailyId.java
+++ b/shared-kernel-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DailyId.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
diff --git a/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Demand.java b/shared-kernel-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/Demand.java
similarity index 82%
rename from shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Demand.java
rename to shared-kernel-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/Demand.java
index 9eb374f..2080505 100644
--- a/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/Demand.java
+++ b/shared-kernel-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/Demand.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.Value;
 
@@ -10,7 +10,7 @@ public class Demand {
     Schema schema;
 
     public enum Schema {
-        AtDayStart, Every3hours, TillDayEnd, Twice
+        AtDayStart, Till12, TillDayEnd, Twice
     }
 
     public static Demand of(long level) {
diff --git a/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandedLevelsChanged.java b/shared-kernel-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandedLevelsChanged.java
similarity index 53%
rename from shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandedLevelsChanged.java
rename to shared-kernel-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandedLevelsChanged.java
index 819c6a2..032bfef 100644
--- a/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/DemandedLevelsChanged.java
+++ b/shared-kernel-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/DemandedLevelsChanged.java
@@ -1,7 +1,7 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.Value;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.factory.product.management.RefNoId;
 
 import java.util.Map;
 
@@ -14,5 +14,9 @@ public class DemandedLevelsChanged {
     public static class Change {
         Demand previous;
         Demand current;
+
+        public long getDiff() {
+            return previous.getLevel() - current.getLevel();
+        }
     }
 }
diff --git a/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewRequired.java b/shared-kernel-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ReviewRequired.java
similarity index 80%
rename from shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewRequired.java
rename to shared-kernel-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ReviewRequired.java
index f12366f..20ab817 100644
--- a/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/demand/forecasting/ReviewRequired.java
+++ b/shared-kernel-model/src/main/java/io/dddbyexamples/factory/demand/forecasting/ReviewRequired.java
@@ -1,7 +1,7 @@
-package pl.com.dddbyexamples.factory.demand.forecasting;
+package io.dddbyexamples.factory.demand.forecasting;
 
 import lombok.Value;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.factory.product.management.RefNoId;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/product/management/RefNoId.java b/shared-kernel-model/src/main/java/io/dddbyexamples/factory/product/management/RefNoId.java
similarity index 80%
rename from shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/product/management/RefNoId.java
rename to shared-kernel-model/src/main/java/io/dddbyexamples/factory/product/management/RefNoId.java
index da9a63f..c03cf3e 100644
--- a/shared-kernel-model/src/main/java/pl/com/dddbyexamples/factory/product/management/RefNoId.java
+++ b/shared-kernel-model/src/main/java/io/dddbyexamples/factory/product/management/RefNoId.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.product.management;
+package io.dddbyexamples.factory.product.management;
 
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
diff --git a/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/MonitoringConfiguration.java b/shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/MonitoringConfiguration.java
similarity index 80%
rename from shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/MonitoringConfiguration.java
rename to shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/MonitoringConfiguration.java
index c0daa89..a72a7ef 100644
--- a/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/MonitoringConfiguration.java
+++ b/shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/MonitoringConfiguration.java
@@ -1,9 +1,9 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring;
+package io.dddbyexamples.factory.shortages.prediction.monitoring;
 
+import io.dddbyexamples.factory.shortages.prediction.ConfigurationParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import pl.com.dddbyexamples.factory.shortages.prediction.ConfigurationParams;
 
 @Configuration
 class MonitoringConfiguration {
diff --git a/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepository.java b/shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepository.java
similarity index 77%
rename from shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepository.java
rename to shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepository.java
index 862df4b..b11292a 100644
--- a/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepository.java
+++ b/shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepository.java
@@ -1,13 +1,13 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring;
+package io.dddbyexamples.factory.shortages.prediction.monitoring;
 
+import io.dddbyexamples.factory.shortages.prediction.ConfigurationParams;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-import pl.com.dddbyexamples.factory.shortages.prediction.ConfigurationParams;
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts;
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesDao;
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesEntity;
-import pl.com.dddbyexamples.tools.TechnicalId;
+import io.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts;
+import io.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesDao;
+import io.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesEntity;
+import io.dddbyexamples.tools.TechnicalId;
 
 import java.util.Optional;
 
diff --git a/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesDao.java b/shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesDao.java
similarity index 82%
rename from shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesDao.java
rename to shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesDao.java
index 61a8245..b5a06a0 100644
--- a/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesDao.java
+++ b/shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesDao.java
@@ -1,10 +1,10 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence;
+package io.dddbyexamples.factory.shortages.prediction.monitoring.persistence;
 
+import io.dddbyexamples.tools.ProjectionRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 import org.springframework.data.rest.core.annotation.RestResource;
 import org.springframework.stereotype.Repository;
-import pl.com.dddbyexamples.tools.ProjectionRepository;
 
 import java.util.Optional;
 
diff --git a/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesEntity.java b/shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesEntity.java
similarity index 80%
rename from shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesEntity.java
rename to shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesEntity.java
index 4bdee3c..fad2970 100644
--- a/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesEntity.java
+++ b/shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/persistence/ShortagesEntity.java
@@ -1,12 +1,12 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence;
+package io.dddbyexamples.factory.shortages.prediction.monitoring.persistence;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage;
-import pl.com.dddbyexamples.tools.JsonConverter;
-import pl.com.dddbyexamples.tools.TechnicalId;
+import io.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.factory.shortages.prediction.Shortage;
+import io.dddbyexamples.tools.JsonConverter;
+import io.dddbyexamples.tools.TechnicalId;
 
 import javax.persistence.*;
 import java.io.Serializable;
diff --git a/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationConfiguration.java b/shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/NotificationConfiguration.java
similarity index 90%
rename from shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationConfiguration.java
rename to shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/NotificationConfiguration.java
index b7797b7..483f49b 100644
--- a/shortages-prediction-adapters/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationConfiguration.java
+++ b/shortages-prediction-adapters/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/NotificationConfiguration.java
@@ -1,9 +1,9 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.notification;
+package io.dddbyexamples.factory.shortages.prediction.notification;
 
+import io.dddbyexamples.factory.shortages.prediction.Shortage;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage;
 
 import java.time.Clock;
 
diff --git a/shortages-prediction-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java b/shortages-prediction-adapters/src/test/groovy/io/dddbyexamples/factory/Configuration.java
similarity index 70%
rename from shortages-prediction-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java
rename to shortages-prediction-adapters/src/test/groovy/io/dddbyexamples/factory/Configuration.java
index 003e970..49a8e32 100644
--- a/shortages-prediction-adapters/src/test/groovy/pl/com/dddbyexamples/factory/Configuration.java
+++ b/shortages-prediction-adapters/src/test/groovy/io/dddbyexamples/factory/Configuration.java
@@ -1,16 +1,16 @@
-package pl.com.dddbyexamples.factory;
+package io.dddbyexamples.factory;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecast;
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts;
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage;
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageEvents;
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageSolved;
+import io.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecast;
+import io.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts;
+import io.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage;
+import io.dddbyexamples.factory.shortages.prediction.monitoring.ShortageEvents;
+import io.dddbyexamples.factory.shortages.prediction.monitoring.ShortageSolved;
 
 import java.time.Clock;
 
diff --git a/shortages-prediction-adapters/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepositoryTest.groovy b/shortages-prediction-adapters/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepositoryTest.groovy
similarity index 80%
rename from shortages-prediction-adapters/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepositoryTest.groovy
rename to shortages-prediction-adapters/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepositoryTest.groovy
index e773fe6..bfe9f4d 100644
--- a/shortages-prediction-adapters/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepositoryTest.groovy
+++ b/shortages-prediction-adapters/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessORMRepositoryTest.groovy
@@ -1,22 +1,19 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring
+package io.dddbyexamples.factory.shortages.prediction.monitoring
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.annotation.Commit
-import pl.com.dddbyexamples.factory.product.management.RefNoId
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageEvents
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageSolved
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesDao
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesEntity
+import io.dddbyexamples.factory.product.management.RefNoId
+import io.dddbyexamples.factory.shortages.prediction.Shortage
+import io.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts
+import io.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesDao
+import io.dddbyexamples.factory.shortages.prediction.monitoring.persistence.ShortagesEntity
 import spock.lang.Specification
 
 import javax.transaction.Transactional
 import java.time.LocalDateTime
 
-import static pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage.After.DemandChanged
+import static io.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage.After.DemandChanged
 
 @SpringBootTest
 @Transactional
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/ConfigurationParams.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/ConfigurationParams.java
similarity index 67%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/ConfigurationParams.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/ConfigurationParams.java
index 5a2ed6b..445c5c1 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/ConfigurationParams.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/ConfigurationParams.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.shortages.prediction;
+package io.dddbyexamples.factory.shortages.prediction;
 
 /**
  * Created by michal on 02.02.2017.
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/Shortage.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/Shortage.java
similarity index 97%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/Shortage.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/Shortage.java
index 8d2849e..74c2e47 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/Shortage.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/Shortage.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.shortages.prediction;
+package io.dddbyexamples.factory.shortages.prediction;
 
 import lombok.AllArgsConstructor;
 import lombok.Value;
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/DeliveriesForecast.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/DeliveriesForecast.java
similarity index 80%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/DeliveriesForecast.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/DeliveriesForecast.java
index b619d95..d4b751c 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/DeliveriesForecast.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/DeliveriesForecast.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.calculation;
+package io.dddbyexamples.factory.shortages.prediction.calculation;
 
 import lombok.AllArgsConstructor;
 
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ProductionForecast.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ProductionForecast.java
similarity index 95%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ProductionForecast.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ProductionForecast.java
index 43a005a..c41c814 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ProductionForecast.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ProductionForecast.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.calculation;
+package io.dddbyexamples.factory.shortages.prediction.calculation;
 
 import lombok.AllArgsConstructor;
 import lombok.Value;
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ProductionOutputs.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ProductionOutputs.java
similarity index 87%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ProductionOutputs.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ProductionOutputs.java
index 48727ae..11889c6 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ProductionOutputs.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ProductionOutputs.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.calculation;
+package io.dddbyexamples.factory.shortages.prediction.calculation;
 
 import lombok.AllArgsConstructor;
 
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecast.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecast.java
similarity index 88%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecast.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecast.java
index 5e5f363..ce80a05 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecast.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecast.java
@@ -1,7 +1,7 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.calculation;
+package io.dddbyexamples.factory.shortages.prediction.calculation;
 
+import io.dddbyexamples.factory.shortages.prediction.Shortage;
 import lombok.AllArgsConstructor;
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage;
 
 import java.time.LocalDateTime;
 import java.util.Optional;
diff --git a/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecasts.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecasts.java
new file mode 100644
index 0000000..0ba97f1
--- /dev/null
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecasts.java
@@ -0,0 +1,7 @@
+package io.dddbyexamples.factory.shortages.prediction.calculation;
+
+import io.dddbyexamples.factory.product.management.RefNoId;
+
+public interface ShortageForecasts {
+    ShortageForecast get(RefNoId refNo, int daysAhead);
+}
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/Stock.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/Stock.java
similarity index 54%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/Stock.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/Stock.java
index c02648d..0df5dd2 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/Stock.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/calculation/Stock.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.calculation;
+package io.dddbyexamples.factory.shortages.prediction.calculation;
 
 import lombok.Value;
 
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/NewShortage.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/NewShortage.java
similarity index 54%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/NewShortage.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/NewShortage.java
index 4abffa2..234350e 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/NewShortage.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/NewShortage.java
@@ -1,8 +1,8 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring;
+package io.dddbyexamples.factory.shortages.prediction.monitoring;
 
 import lombok.Value;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage;
+import io.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.factory.shortages.prediction.Shortage;
 
 /**
  * Created by michal on 03.02.2017.
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicy.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicy.java
similarity index 54%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicy.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicy.java
index 3ea5459..955f7ba 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicy.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicy.java
@@ -1,6 +1,6 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring;
+package io.dddbyexamples.factory.shortages.prediction.monitoring;
 
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage;
+import io.dddbyexamples.factory.shortages.prediction.Shortage;
 
 interface ShortageDiffPolicy {
 
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEvents.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEvents.java
similarity index 60%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEvents.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEvents.java
index e8c5f4b..e7f8622 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEvents.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageEvents.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring;
+package io.dddbyexamples.factory.shortages.prediction.monitoring;
 
 public interface ShortageEvents {
     void emit(NewShortage event);
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcess.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcess.java
similarity index 75%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcess.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcess.java
index d694730..f8aa7d3 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcess.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcess.java
@@ -1,11 +1,11 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring;
+package io.dddbyexamples.factory.shortages.prediction.monitoring;
 
+import io.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.factory.shortages.prediction.ConfigurationParams;
+import io.dddbyexamples.factory.shortages.prediction.Shortage;
+import io.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecast;
+import io.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts;
 import lombok.AllArgsConstructor;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-import pl.com.dddbyexamples.factory.shortages.prediction.ConfigurationParams;
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage;
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecast;
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts;
 
 import java.util.Optional;
 
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessRepository.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessRepository.java
similarity index 52%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessRepository.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessRepository.java
index 9908d29..81b2739 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessRepository.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessRepository.java
@@ -1,6 +1,6 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring;
+package io.dddbyexamples.factory.shortages.prediction.monitoring;
 
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
+import io.dddbyexamples.factory.product.management.RefNoId;
 
 interface ShortagePredictionProcessRepository {
     ShortagePredictionProcess get(RefNoId refNo);
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionService.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionService.java
similarity index 80%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionService.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionService.java
index de57558..aa89f41 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionService.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionService.java
@@ -1,7 +1,7 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring;
+package io.dddbyexamples.factory.shortages.prediction.monitoring;
 
+import io.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged;
 import lombok.AllArgsConstructor;
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged;
 
 @AllArgsConstructor
 public class ShortagePredictionService {
diff --git a/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageSolved.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageSolved.java
new file mode 100644
index 0000000..67d88a0
--- /dev/null
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageSolved.java
@@ -0,0 +1,9 @@
+package io.dddbyexamples.factory.shortages.prediction.monitoring;
+
+import lombok.Value;
+import io.dddbyexamples.factory.product.management.RefNoId;
+
+@Value
+public class ShortageSolved {
+    RefNoId refNo;
+}
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortage.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortage.java
similarity index 88%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortage.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortage.java
index 65f78e2..44e9253 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortage.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortage.java
@@ -1,11 +1,11 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.notification;
+package io.dddbyexamples.factory.shortages.prediction.notification;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Singular;
 import lombok.Value;
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage;
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage;
+import io.dddbyexamples.factory.shortages.prediction.Shortage;
+import io.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage;
 
 import java.time.Clock;
 import java.time.LocalDateTime;
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/Notifications.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/Notifications.java
similarity index 59%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/Notifications.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/Notifications.java
index f816f89..6fb6791 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/Notifications.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/Notifications.java
@@ -1,6 +1,6 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.notification;
+package io.dddbyexamples.factory.shortages.prediction.notification;
 
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage;
+import io.dddbyexamples.factory.shortages.prediction.Shortage;
 
 /**
  * Created by michal on 02.02.2017.
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/QualityTasks.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/QualityTasks.java
similarity index 64%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/QualityTasks.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/QualityTasks.java
index c675669..9296ee4 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/QualityTasks.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/QualityTasks.java
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.notification;
+package io.dddbyexamples.factory.shortages.prediction.notification;
 
 /**
  * Created by michal on 02.02.2017.
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicy.java b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicy.java
similarity index 83%
rename from shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicy.java
rename to shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicy.java
index 5275daf..18b2765 100644
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicy.java
+++ b/shortages-prediction-model/src/main/java/io/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicy.java
@@ -1,6 +1,6 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.notification;
+package io.dddbyexamples.factory.shortages.prediction.notification;
 
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage;
+import io.dddbyexamples.factory.shortages.prediction.Shortage;
 
 import java.time.LocalDateTime;
 
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecasts.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecasts.java
deleted file mode 100644
index 87bd08a..0000000
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageForecasts.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.calculation;
-
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-
-public interface ShortageForecasts {
-    ShortageForecast get(RefNoId refNo, int daysAhead);
-}
diff --git a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageSolved.java b/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageSolved.java
deleted file mode 100644
index 7e748ee..0000000
--- a/shortages-prediction-model/src/main/java/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageSolved.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring;
-
-import lombok.Value;
-import pl.com.dddbyexamples.factory.product.management.RefNoId;
-
-@Value
-public class ShortageSolved {
-    RefNoId refNo;
-}
diff --git a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationAlgorithmSpec.groovy b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationAlgorithmSpec.groovy
similarity index 98%
rename from shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationAlgorithmSpec.groovy
rename to shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationAlgorithmSpec.groovy
index b6b71a5..9271901 100644
--- a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationAlgorithmSpec.groovy
+++ b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationAlgorithmSpec.groovy
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.calculation
+package io.dddbyexamples.factory.shortages.prediction.calculation
 
 import spock.lang.Specification
 
diff --git a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationExamplesSpec.groovy b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationExamplesSpec.groovy
similarity index 97%
rename from shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationExamplesSpec.groovy
rename to shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationExamplesSpec.groovy
index 34ce831..88a3077 100644
--- a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationExamplesSpec.groovy
+++ b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/ShortageCalculationExamplesSpec.groovy
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.calculation
+package io.dddbyexamples.factory.shortages.prediction.calculation
 
 import spock.lang.Specification
 
diff --git a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationAssembler.groovy b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationAssembler.groovy
similarity index 52%
rename from shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationAssembler.groovy
rename to shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationAssembler.groovy
index 26520a1..a87aa1a 100644
--- a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationAssembler.groovy
+++ b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationAssembler.groovy
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.calculation
+package io.dddbyexamples.factory.shortages.prediction.calculation
 
 class ShortagesCalculationAssembler implements ShortagesCalculationTrait {
 }
diff --git a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationTrait.groovy b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationTrait.groovy
similarity index 80%
rename from shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationTrait.groovy
rename to shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationTrait.groovy
index 166b58b..9e4e653 100644
--- a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationTrait.groovy
+++ b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/ShortagesCalculationTrait.groovy
@@ -1,10 +1,7 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.calculation
+package io.dddbyexamples.factory.shortages.prediction.calculation
 
-import pl.com.dddbyexamples.factory.product.management.RefNoId
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecast
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.Stock
+import io.dddbyexamples.factory.product.management.RefNoId
+import io.dddbyexamples.factory.shortages.prediction.Shortage
 
 import java.time.Duration
 import java.time.LocalDateTime
diff --git a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/TimeGrammar.groovy b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/TimeGrammar.groovy
similarity index 88%
rename from shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/TimeGrammar.groovy
rename to shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/TimeGrammar.groovy
index 6b4bf22..9228cad 100644
--- a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/calculation/TimeGrammar.groovy
+++ b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/calculation/TimeGrammar.groovy
@@ -1,4 +1,4 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.calculation
+package io.dddbyexamples.factory.shortages.prediction.calculation
 
 import java.time.Duration
 import java.time.LocalDateTime
diff --git a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/InMemoryConfigurationParams.groovy b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/InMemoryConfigurationParams.groovy
similarity index 54%
rename from shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/InMemoryConfigurationParams.groovy
rename to shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/InMemoryConfigurationParams.groovy
index 6834026..d360e7a 100644
--- a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/InMemoryConfigurationParams.groovy
+++ b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/InMemoryConfigurationParams.groovy
@@ -1,6 +1,6 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring
+package io.dddbyexamples.factory.shortages.prediction.monitoring
 
-import pl.com.dddbyexamples.factory.shortages.prediction.ConfigurationParams
+import io.dddbyexamples.factory.shortages.prediction.ConfigurationParams
 
 class InMemoryConfigurationParams implements ConfigurationParams {
     int daysAhead;
diff --git a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicySpec.groovy b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicySpec.groovy
similarity index 94%
rename from shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicySpec.groovy
rename to shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicySpec.groovy
index 39cbd1d..5185a4e 100644
--- a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicySpec.groovy
+++ b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortageDiffPolicySpec.groovy
@@ -1,7 +1,7 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring
+package io.dddbyexamples.factory.shortages.prediction.monitoring
 
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.TimeGrammar
+import io.dddbyexamples.factory.shortages.prediction.Shortage
+import io.dddbyexamples.factory.shortages.prediction.calculation.TimeGrammar
 import spock.lang.Specification
 
 import java.time.LocalDateTime
diff --git a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessSpec.groovy b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessSpec.groovy
similarity index 87%
rename from shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessSpec.groovy
rename to shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessSpec.groovy
index a2fd37e..ee2ce44 100644
--- a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessSpec.groovy
+++ b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessSpec.groovy
@@ -1,11 +1,8 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring
+package io.dddbyexamples.factory.shortages.prediction.monitoring
 
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageEvents
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageSolved
 import spock.lang.Specification
 
-import static pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage.After
+import static NewShortage.After
 
 class ShortagePredictionProcessSpec extends Specification implements ShortagePredictionProcessTrait {
 
diff --git a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessTrait.groovy b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessTrait.groovy
similarity index 74%
rename from shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessTrait.groovy
rename to shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessTrait.groovy
index e9a2504..4b5dee8 100644
--- a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessTrait.groovy
+++ b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionProcessTrait.groovy
@@ -1,13 +1,10 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring
+package io.dddbyexamples.factory.shortages.prediction.monitoring
 
-import pl.com.dddbyexamples.factory.product.management.RefNoId
-import pl.com.dddbyexamples.factory.shortages.prediction.ConfigurationParams
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts
-import pl.com.dddbyexamples.factory.shortages.prediction.calculation.ShortagesCalculationAssembler
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageEvents
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageSolved
+import io.dddbyexamples.factory.product.management.RefNoId
+import io.dddbyexamples.factory.shortages.prediction.ConfigurationParams
+import io.dddbyexamples.factory.shortages.prediction.Shortage
+import io.dddbyexamples.factory.shortages.prediction.calculation.ShortageForecasts
+import io.dddbyexamples.factory.shortages.prediction.calculation.ShortagesCalculationAssembler
 
 import java.time.LocalDateTime
 
diff --git a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionServiceSpec.groovy b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionServiceSpec.groovy
similarity index 68%
rename from shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionServiceSpec.groovy
rename to shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionServiceSpec.groovy
index dadaf3d..9cff759 100644
--- a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionServiceSpec.groovy
+++ b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/monitoring/ShortagePredictionServiceSpec.groovy
@@ -1,8 +1,6 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.monitoring
+package io.dddbyexamples.factory.shortages.prediction.monitoring
 
-import pl.com.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortagePredictionService
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.ShortageSolved
+import io.dddbyexamples.factory.demand.forecasting.DemandedLevelsChanged
 import spock.lang.Specification
 
 class ShortagePredictionServiceSpec extends Specification implements ShortagePredictionProcessTrait {
diff --git a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortageSpec.groovy b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortageSpec.groovy
similarity index 85%
rename from shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortageSpec.groovy
rename to shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortageSpec.groovy
index 7a021e9..55133ae 100644
--- a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortageSpec.groovy
+++ b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/notification/NotificationOfShortageSpec.groovy
@@ -1,11 +1,8 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.notification
+package io.dddbyexamples.factory.shortages.prediction.notification
 
-import pl.com.dddbyexamples.factory.product.management.RefNoId
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage
-import pl.com.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage
-import pl.com.dddbyexamples.factory.shortages.prediction.notification.NotificationOfShortage
-import pl.com.dddbyexamples.factory.shortages.prediction.notification.QualityTasks
-import pl.com.dddbyexamples.factory.shortages.prediction.notification.RecoveryTaskPriorityChangePolicy
+import io.dddbyexamples.factory.product.management.RefNoId
+import io.dddbyexamples.factory.shortages.prediction.Shortage
+import io.dddbyexamples.factory.shortages.prediction.monitoring.NewShortage
 import spock.lang.Specification
 
 import java.time.*
diff --git a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicySpec.groovy b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicySpec.groovy
similarity index 91%
rename from shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicySpec.groovy
rename to shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicySpec.groovy
index 9bcbbb6..f5a2c13 100644
--- a/shortages-prediction-model/src/test/groovy/pl/com/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicySpec.groovy
+++ b/shortages-prediction-model/src/test/groovy/io/dddbyexamples/factory/shortages/prediction/notification/RecoveryTaskPriorityChangePolicySpec.groovy
@@ -1,7 +1,6 @@
-package pl.com.dddbyexamples.factory.shortages.prediction.notification
+package io.dddbyexamples.factory.shortages.prediction.notification
 
-import pl.com.dddbyexamples.factory.shortages.prediction.Shortage
-import pl.com.dddbyexamples.factory.shortages.prediction.notification.RecoveryTaskPriorityChangePolicy
+import io.dddbyexamples.factory.shortages.prediction.Shortage
 import spock.lang.Specification
 
 import java.time.Duration