diff --git a/src/eventservice/impl/PullConsumerProxyImpl.java b/eventservice/impl/PullConsumerProxyImpl.java
similarity index 100%
rename from src/eventservice/impl/PullConsumerProxyImpl.java
rename to eventservice/impl/PullConsumerProxyImpl.java
diff --git a/src/eventservice/impl/PushConsumerProxyImpl.java b/eventservice/impl/PushConsumerProxyImpl.java
similarity index 100%
rename from src/eventservice/impl/PushConsumerProxyImpl.java
rename to eventservice/impl/PushConsumerProxyImpl.java
diff --git a/src/exercise/PullConsumer.java b/exercise/PullConsumer.java
similarity index 100%
rename from src/exercise/PullConsumer.java
rename to exercise/PullConsumer.java
diff --git a/src/exercise/PushConsumer.java b/exercise/PushConsumer.java
similarity index 100%
rename from src/exercise/PushConsumer.java
rename to exercise/PushConsumer.java
diff --git a/src/suppliers/PushSupplier.java b/suppliers/PushSupplier.java
similarity index 100%
rename from src/suppliers/PushSupplier.java
rename to suppliers/PushSupplier.java
diff --git a/src/suppliers/SimpleEvent.java b/suppliers/SimpleEvent.java
similarity index 100%
rename from src/suppliers/SimpleEvent.java
rename to suppliers/SimpleEvent.java