diff --git a/analytics1/types.go b/analytics/types.go similarity index 100% rename from analytics1/types.go rename to analytics/types.go diff --git a/device1/types.go b/device/types.go similarity index 100% rename from device1/types.go rename to device/types.go diff --git a/event1/operation.go b/event/operation.go similarity index 100% rename from event1/operation.go rename to event/operation.go diff --git a/event1/types.go b/event/types.go similarity index 100% rename from event1/types.go rename to event/types.go diff --git a/media1/types.go b/media/types.go similarity index 100% rename from media1/types.go rename to media/types.go diff --git a/ptz1/types.go b/ptz/types.go similarity index 100% rename from ptz1/types.go rename to ptz/types.go