diff --git a/schema/ContextSourceNotification.json b/schema/Registrations/ContextSourceNotification.json
similarity index 100%
rename from schema/ContextSourceNotification.json
rename to schema/Registrations/ContextSourceNotification.json
diff --git a/schema/ContextSourceRegistration.json b/schema/Registrations/ContextSourceRegistration.json
similarity index 100%
rename from schema/ContextSourceRegistration.json
rename to schema/Registrations/ContextSourceRegistration.json
diff --git a/schema/Notification.json b/schema/Subscriptions/Notification.json
similarity index 100%
rename from schema/Notification.json
rename to schema/Subscriptions/Notification.json
diff --git a/schema/Subscription.json b/schema/Subscriptions/Subscription.json
similarity index 100%
rename from schema/Subscription.json
rename to schema/Subscriptions/Subscription.json
diff --git a/schema/EntityTemporal.json b/schema/temporal/EntityTemporal.json
similarity index 100%
rename from schema/EntityTemporal.json
rename to schema/temporal/EntityTemporal.json
diff --git a/schema/EntityTemporalList.json b/schema/temporal/EntityTemporalList.json
similarity index 100%
rename from schema/EntityTemporalList.json
rename to schema/temporal/EntityTemporalList.json
diff --git a/schema/Entity_temporalValues.json b/schema/temporal/Entity_temporalValues.json
similarity index 100%
rename from schema/Entity_temporalValues.json
rename to schema/temporal/Entity_temporalValues.json