diff --git a/core.impl/src/main/java/com/apobates/forum/core/impl/event/BoardConfigListener.java b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/BoardConfigListener.java
similarity index 91%
rename from core.impl/src/main/java/com/apobates/forum/core/impl/event/BoardConfigListener.java
rename to core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/BoardConfigListener.java
index 41925fd383412932e1def485e47023c3d4e53142..5e14f5b67269f4fa6ffb3baa91a8d164f49728d8 100644
--- a/core.impl/src/main/java/com/apobates/forum/core/impl/event/BoardConfigListener.java
+++ b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/BoardConfigListener.java
@@ -1,6 +1,8 @@
-package com.apobates.forum.core.impl.event;
+package com.apobates.forum.core.impl.event.listener;
 
 import java.util.Optional;
+
+import com.apobates.forum.core.impl.event.BoardCreateEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/core.impl/src/main/java/com/apobates/forum/core/impl/event/BoardStatsListener.java b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/BoardStatsListener.java
similarity index 89%
rename from core.impl/src/main/java/com/apobates/forum/core/impl/event/BoardStatsListener.java
rename to core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/BoardStatsListener.java
index 423103e73e3220486abc5113a3a31dd0af9d92e2..a15b014439a9e72feb585a49ad64257b28539a55 100644
--- a/core.impl/src/main/java/com/apobates/forum/core/impl/event/BoardStatsListener.java
+++ b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/BoardStatsListener.java
@@ -1,5 +1,6 @@
-package com.apobates.forum.core.impl.event;
+package com.apobates.forum.core.impl.event.listener;
 
+import com.apobates.forum.core.impl.event.BoardCreateEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/core.impl/src/main/java/com/apobates/forum/core/impl/event/PlugTopicConfigListener.java b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/PlugTopicConfigListener.java
similarity index 95%
rename from core.impl/src/main/java/com/apobates/forum/core/impl/event/PlugTopicConfigListener.java
rename to core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/PlugTopicConfigListener.java
index cd702132c8c23acc8d78435ff569f6afe3e428ca..5c2e9e8d929e281269590ca68e27103d3bd00e2b 100644
--- a/core.impl/src/main/java/com/apobates/forum/core/impl/event/PlugTopicConfigListener.java
+++ b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/PlugTopicConfigListener.java
@@ -1,4 +1,4 @@
-package com.apobates.forum.core.impl.event;
+package com.apobates.forum.core.impl.event.listener;
 
 import com.apobates.forum.core.api.dao.TopicConfigDao;
 import com.apobates.forum.core.entity.Topic;
diff --git a/core.impl/src/main/java/com/apobates/forum/core/impl/event/PlugTopicRelateActionListener.java b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/PlugTopicRelateActionListener.java
similarity index 96%
rename from core.impl/src/main/java/com/apobates/forum/core/impl/event/PlugTopicRelateActionListener.java
rename to core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/PlugTopicRelateActionListener.java
index 8dc9f48d33d8c734928fd370aed05bf592032a4f..7f960b9d1163d95236695944c7ee030ce63d9d42 100644
--- a/core.impl/src/main/java/com/apobates/forum/core/impl/event/PlugTopicRelateActionListener.java
+++ b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/PlugTopicRelateActionListener.java
@@ -1,4 +1,4 @@
-package com.apobates.forum.core.impl.event;
+package com.apobates.forum.core.impl.event.listener;
 
 import com.apobates.forum.core.api.dao.TopicActionCollectionDao;
 import com.apobates.forum.core.entity.Topic;
diff --git a/core.impl/src/main/java/com/apobates/forum/core/impl/event/PlugTopicStatsListener.java b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/PlugTopicStatsListener.java
similarity index 96%
rename from core.impl/src/main/java/com/apobates/forum/core/impl/event/PlugTopicStatsListener.java
rename to core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/PlugTopicStatsListener.java
index 197013f5ff9a5cb159e4b12833b5ebc91174f5f3..03a37b56bc9f7bb92a987ad365e5f3b8a6c142fb 100644
--- a/core.impl/src/main/java/com/apobates/forum/core/impl/event/PlugTopicStatsListener.java
+++ b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/PlugTopicStatsListener.java
@@ -1,4 +1,4 @@
-package com.apobates.forum.core.impl.event;
+package com.apobates.forum.core.impl.event.listener;
 
 
 import com.apobates.forum.core.api.dao.BoardStatsDao;
diff --git a/core.impl/src/main/java/com/apobates/forum/core/impl/event/PostsStatsListener.java b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/PostsStatsListener.java
similarity index 92%
rename from core.impl/src/main/java/com/apobates/forum/core/impl/event/PostsStatsListener.java
rename to core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/PostsStatsListener.java
index ced7db89a94eb3848f0fcf290b0b6103b1eb1d7a..6b7e3c06679011f7b7c1d967e11082bb3ff14eb3 100644
--- a/core.impl/src/main/java/com/apobates/forum/core/impl/event/PostsStatsListener.java
+++ b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/PostsStatsListener.java
@@ -1,5 +1,6 @@
-package com.apobates.forum.core.impl.event;
+package com.apobates.forum.core.impl.event.listener;
 
+import com.apobates.forum.core.impl.event.PostsPublishEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/core.impl/src/main/java/com/apobates/forum/core/impl/event/TopicConfigListener.java b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/TopicConfigListener.java
similarity index 91%
rename from core.impl/src/main/java/com/apobates/forum/core/impl/event/TopicConfigListener.java
rename to core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/TopicConfigListener.java
index eb11ea51bc7f757c2b1fc1f8d2524f4a357497f1..52d753714fab8b4fd328809d46d05189dcd7e4ec 100644
--- a/core.impl/src/main/java/com/apobates/forum/core/impl/event/TopicConfigListener.java
+++ b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/TopicConfigListener.java
@@ -1,7 +1,8 @@
-package com.apobates.forum.core.impl.event;
+package com.apobates.forum.core.impl.event.listener;
 
 import java.util.Optional;
 
+import com.apobates.forum.core.impl.event.TopicPublishEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/core.impl/src/main/java/com/apobates/forum/core/impl/event/TopicStatsListener.java b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/TopicStatsListener.java
similarity index 92%
rename from core.impl/src/main/java/com/apobates/forum/core/impl/event/TopicStatsListener.java
rename to core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/TopicStatsListener.java
index 94cccf3771d33eb5dbecf1295cd15572d1234a6c..f423108ffa2071974ad2761ed58da2a2c8c9d1e1 100644
--- a/core.impl/src/main/java/com/apobates/forum/core/impl/event/TopicStatsListener.java
+++ b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/TopicStatsListener.java
@@ -1,5 +1,6 @@
-package com.apobates.forum.core.impl.event;
+package com.apobates.forum.core.impl.event.listener;
 
+import com.apobates.forum.core.impl.event.TopicPublishEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/core.impl/src/main/java/com/apobates/forum/core/impl/event/TopicTagListener.java b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/TopicTagListener.java
similarity index 90%
rename from core.impl/src/main/java/com/apobates/forum/core/impl/event/TopicTagListener.java
rename to core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/TopicTagListener.java
index ab860f104c8f1eaa8e973bc382ef637d8a6864c3..75b6dcbec791db7a1065be01f24c0931e18b5d8c 100644
--- a/core.impl/src/main/java/com/apobates/forum/core/impl/event/TopicTagListener.java
+++ b/core.impl/src/main/java/com/apobates/forum/core/impl/event/listener/TopicTagListener.java
@@ -1,5 +1,6 @@
-package com.apobates.forum.core.impl.event;
+package com.apobates.forum.core.impl.event.listener;
 
+import com.apobates.forum.core.impl.event.TopicPublishEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/letterbox.impl/src/main/java/com/apobates/forum/letterbox/impl/event/ForumLetterPostInboxListener.java b/letterbox.impl/src/main/java/com/apobates/forum/letterbox/impl/event/listener/ForumLetterPostInboxListener.java
similarity index 91%
rename from letterbox.impl/src/main/java/com/apobates/forum/letterbox/impl/event/ForumLetterPostInboxListener.java
rename to letterbox.impl/src/main/java/com/apobates/forum/letterbox/impl/event/listener/ForumLetterPostInboxListener.java
index c5d3310fd25ef3f8247643f83e548f5eaa1753c9..8d0439f1fece5d8b48ee502975341c1c510d1746 100644
--- a/letterbox.impl/src/main/java/com/apobates/forum/letterbox/impl/event/ForumLetterPostInboxListener.java
+++ b/letterbox.impl/src/main/java/com/apobates/forum/letterbox/impl/event/listener/ForumLetterPostInboxListener.java
@@ -1,7 +1,9 @@
-package com.apobates.forum.letterbox.impl.event;
+package com.apobates.forum.letterbox.impl.event.listener;
 
 import java.util.HashSet;
 import java.util.Set;
+
+import com.apobates.forum.letterbox.impl.event.ForumLetterPostEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/member.impl/src/main/java/com/apobates/forum/member/impl/event/MemberChangeStatusListener.java b/member.impl/src/main/java/com/apobates/forum/member/impl/event/listener/MemberChangeStatusListener.java
similarity index 88%
rename from member.impl/src/main/java/com/apobates/forum/member/impl/event/MemberChangeStatusListener.java
rename to member.impl/src/main/java/com/apobates/forum/member/impl/event/listener/MemberChangeStatusListener.java
index 50e5d6cb14c6997a3bf2cf897b9bb86584a47570..47e7155706f3e5a79e56076762943b1dba31ad9e 100644
--- a/member.impl/src/main/java/com/apobates/forum/member/impl/event/MemberChangeStatusListener.java
+++ b/member.impl/src/main/java/com/apobates/forum/member/impl/event/listener/MemberChangeStatusListener.java
@@ -1,5 +1,6 @@
-package com.apobates.forum.member.impl.event;
+package com.apobates.forum.member.impl.event.listener;
 
+import com.apobates.forum.member.impl.event.MemberPenalizeEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/member.impl/src/main/java/com/apobates/forum/member/impl/event/MemberSignUpInviteCodeListener.java b/member.impl/src/main/java/com/apobates/forum/member/impl/event/listener/MemberSignUpInviteCodeListener.java
similarity index 90%
rename from member.impl/src/main/java/com/apobates/forum/member/impl/event/MemberSignUpInviteCodeListener.java
rename to member.impl/src/main/java/com/apobates/forum/member/impl/event/listener/MemberSignUpInviteCodeListener.java
index 32a6cf65f6e23a4ae7f4fe1f5e3bcc827f8cb063..cbaaaf750762a08dd27175fe1d8ef16856f56582 100644
--- a/member.impl/src/main/java/com/apobates/forum/member/impl/event/MemberSignUpInviteCodeListener.java
+++ b/member.impl/src/main/java/com/apobates/forum/member/impl/event/listener/MemberSignUpInviteCodeListener.java
@@ -1,5 +1,6 @@
-package com.apobates.forum.member.impl.event;
+package com.apobates.forum.member.impl.event.listener;
 
+import com.apobates.forum.member.impl.event.MemberSignUpEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/member.impl/src/main/java/com/apobates/forum/member/impl/event/MemberSignUpPromoteListener.java b/member.impl/src/main/java/com/apobates/forum/member/impl/event/listener/MemberSignUpPromoteListener.java
similarity index 89%
rename from member.impl/src/main/java/com/apobates/forum/member/impl/event/MemberSignUpPromoteListener.java
rename to member.impl/src/main/java/com/apobates/forum/member/impl/event/listener/MemberSignUpPromoteListener.java
index 3a1303a1570436cf3ace340fbb9715b7ea076228..a1c11b8646d128dfc5bba97bfbc19c91e7017d5b 100644
--- a/member.impl/src/main/java/com/apobates/forum/member/impl/event/MemberSignUpPromoteListener.java
+++ b/member.impl/src/main/java/com/apobates/forum/member/impl/event/listener/MemberSignUpPromoteListener.java
@@ -1,5 +1,6 @@
-package com.apobates.forum.member.impl.event;
+package com.apobates.forum.member.impl.event.listener;
 
+import com.apobates.forum.member.impl.event.MemberSignUpEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;