diff --git a/main/inc/lib/hook/HookAdminBlockEventInterface.php b/main/inc/lib/hook/interfaces/HookAdminBlockEventInterface.php
similarity index 100%
rename from main/inc/lib/hook/HookAdminBlockEventInterface.php
rename to main/inc/lib/hook/interfaces/HookAdminBlockEventInterface.php
diff --git a/main/inc/lib/hook/HookAdminBlockObserverInterface.php b/main/inc/lib/hook/interfaces/HookAdminBlockObserverInterface.php
similarity index 100%
rename from main/inc/lib/hook/HookAdminBlockObserverInterface.php
rename to main/inc/lib/hook/interfaces/HookAdminBlockObserverInterface.php
diff --git a/main/inc/lib/hook/HookCreateUserEventInterface.php b/main/inc/lib/hook/interfaces/HookCreateUserEventInterface.php
similarity index 100%
rename from main/inc/lib/hook/HookCreateUserEventInterface.php
rename to main/inc/lib/hook/interfaces/HookCreateUserEventInterface.php
diff --git a/main/inc/lib/hook/HookCreateUserObserverInterface.php b/main/inc/lib/hook/interfaces/HookCreateUserObserverInterface.php
similarity index 100%
rename from main/inc/lib/hook/HookCreateUserObserverInterface.php
rename to main/inc/lib/hook/interfaces/HookCreateUserObserverInterface.php
diff --git a/main/inc/lib/hook/HookUpdateUserEventInterface.php b/main/inc/lib/hook/interfaces/HookUpdateUserEventInterface.php
similarity index 100%
rename from main/inc/lib/hook/HookUpdateUserEventInterface.php
rename to main/inc/lib/hook/interfaces/HookUpdateUserEventInterface.php
diff --git a/main/inc/lib/hook/HookUpdateUserObserverInterface.php b/main/inc/lib/hook/interfaces/HookUpdateUserObserverInterface.php
similarity index 100%
rename from main/inc/lib/hook/HookUpdateUserObserverInterface.php
rename to main/inc/lib/hook/interfaces/HookUpdateUserObserverInterface.php
diff --git a/main/inc/lib/hook/HookWSRegistrationEventInterface.php b/main/inc/lib/hook/interfaces/HookWSRegistrationEventInterface.php
similarity index 100%
rename from main/inc/lib/hook/HookWSRegistrationEventInterface.php
rename to main/inc/lib/hook/interfaces/HookWSRegistrationEventInterface.php
diff --git a/main/inc/lib/hook/HookWSRegistrationObserverInterface.php b/main/inc/lib/hook/interfaces/HookWSRegistrationObserverInterface.php
similarity index 100%
rename from main/inc/lib/hook/HookWSRegistrationObserverInterface.php
rename to main/inc/lib/hook/interfaces/HookWSRegistrationObserverInterface.php
diff --git a/main/inc/lib/hook/HookEventInterface.php b/main/inc/lib/hook/interfaces/base/HookEventInterface.php
similarity index 100%
rename from main/inc/lib/hook/HookEventInterface.php
rename to main/inc/lib/hook/interfaces/base/HookEventInterface.php
diff --git a/main/inc/lib/hook/HookManagementInterface.php b/main/inc/lib/hook/interfaces/base/HookManagementInterface.php
similarity index 100%
rename from main/inc/lib/hook/HookManagementInterface.php
rename to main/inc/lib/hook/interfaces/base/HookManagementInterface.php
diff --git a/main/inc/lib/hook/HookObserverInterface.php b/main/inc/lib/hook/interfaces/base/HookObserverInterface.php
similarity index 100%
rename from main/inc/lib/hook/HookObserverInterface.php
rename to main/inc/lib/hook/interfaces/base/HookObserverInterface.php
diff --git a/main/inc/lib/hook/HookPluginInterface.php b/main/inc/lib/hook/interfaces/base/HookPluginInterface.php
similarity index 100%
rename from main/inc/lib/hook/HookPluginInterface.php
rename to main/inc/lib/hook/interfaces/base/HookPluginInterface.php