diff --git a/management/server/audit/event.go b/management/server/event/event.go
similarity index 66%
rename from management/server/audit/event.go
rename to management/server/event/event.go
index 4599fc425..b1945abf4 100644
--- a/management/server/audit/event.go
+++ b/management/server/event/event.go
@@ -1,32 +1,35 @@
-package audit
+package event
 
 import "time"
 
 const (
 	// DeviceEvent describes an event that happened of a device (e.g, connected/disconnected)
-	DeviceEvent EventType = "device"
+	DeviceEvent Type = "device"
 	// ManagementEvent describes an event that happened on a Management service (e.g., user added)
-	ManagementEvent EventType = "management"
+	ManagementEvent Type = "management"
 )
 
-type EventType string
+type Type string
 
-// EventSink provides an interface to store or stream events.
-type EventSink interface {
+// Sink provides an interface to store or stream events.
+type Sink interface {
 	// Add an event to the sink.
 	Add(event *Event) error
 	// Close the sink flushing events if necessary
 	Close() error
 }
 
-// Event represents a network activity.
+// Event represents a network activity event.
 type Event struct {
 	// Timestamp of the event
 	Timestamp time.Time
 	// Message of the event
 	Message string
 	// ID of the event (can be empty, meaning that it wasn't yet generated)
-	ID string
+	ID uint64
 	// Type of the event
-	Type EventType
+	Type Type
+
+	//
+
 }
diff --git a/management/server/audit/sqlite.go b/management/server/event/sqlite.go
similarity index 98%
rename from management/server/audit/sqlite.go
rename to management/server/event/sqlite.go
index a59c642de..7617ca55e 100644
--- a/management/server/audit/sqlite.go
+++ b/management/server/event/sqlite.go
@@ -1,4 +1,4 @@
-package audit
+package event
 
 import (
 	"database/sql"