diff --git a/hotspot/HotspotManager.cs b/hotspot/HotspotManager.cs
new file mode 100644
index 0000000..57b5938
--- /dev/null
+++ b/hotspot/HotspotManager.cs
@@ -0,0 +1,19 @@
+// /**
+//  * File: HotspotManager.cs
+//  * Author: haraldwolff
+//  *
+//  * This file and it's content is copyrighted by the Author and / or copyright holder.
+//  * Any use wihtout proper permission is illegal and may lead to legal actions.
+//  *
+//  *
+//  **/
+using System;
+namespace skyspot.hotspot
+{
+    public class HotspotManager
+    {
+        public HotspotManager()
+        {
+        }
+    }
+}
diff --git a/hotspot/HotspotNetwork.cs b/hotspot/HotspotNetwork.cs
new file mode 100644
index 0000000..95efaf2
--- /dev/null
+++ b/hotspot/HotspotNetwork.cs
@@ -0,0 +1,32 @@
+// /**
+//  * File: HotspotNetwork.cs
+//  * Author: haraldwolff
+//  *
+//  * This file and it's content is copyrighted by the Author and / or copyright holder.
+//  * Any use wihtout proper permission is illegal and may lead to legal actions.
+//  *
+//  *
+//  **/
+using System;
+using ln.types.odb.attributes;
+using ln.types.net;
+namespace skyspot.session
+{
+    public class HotspotNetwork
+    {
+        [DocumentID]
+        public readonly Guid ID = Guid.NewGuid();
+
+        public string Name { get; set; }
+        public string Description { get; set; }
+
+        public string SID { get; set; }
+
+        public Network4 ClientsNetwork { get; set; }
+        public byte[] RadiusSecret { get; set; }
+
+        public HotspotNetwork()
+        {
+        }
+    }
+}
diff --git a/session/HotspotSession.cs b/hotspot/HotspotSession.cs
similarity index 65%
rename from session/HotspotSession.cs
rename to hotspot/HotspotSession.cs
index 548d948..3afe493 100644
--- a/session/HotspotSession.cs
+++ b/hotspot/HotspotSession.cs
@@ -6,13 +6,17 @@ namespace skyspot.session
 {
     public class HotspotSession
     {
-        [DocumentIDAttribute]
+        [DocumentID]
         public Guid ID { get; set; }
 
-        public IPv4 IP { get; set; }
-        public MAC MacAddress { get; set; }
+        [ByReference]
+        public HotspotNetwork HotspotNetwork;
 
-        public HotspotUser HotspotUser { get; set; }
+        [ByReference]
+        public HotspotUser HotspotUser;
+
+        public IPv4 IP;
+        public MAC MacAddress;
 
         public DateTimeOffset Created { get; }
         public DateTimeOffset Destroyed { get; private set; }
@@ -20,12 +24,14 @@ namespace skyspot.session
         public long RXTrafficVolume { get; set; }
         public long TXTrafficVolume { get; set; }
 
-
         public HotspotSession()
         {
             ID = Guid.NewGuid();
             Created = DateTimeOffset.Now;
             Destroyed = DateTimeOffset.MinValue;
         }
+        public HotspotSession(HotspotNetwork hotspotNetwork,MAC clientMAC)
+            :this()
+        {}
     }
 }
diff --git a/session/SessionManager.cs b/session/SessionManager.cs
new file mode 100644
index 0000000..32b17f2
--- /dev/null
+++ b/session/SessionManager.cs
@@ -0,0 +1,19 @@
+// /**
+//  * File: SessionManager.cs
+//  * Author: haraldwolff
+//  *
+//  * This file and it's content is copyrighted by the Author and / or copyright holder.
+//  * Any use wihtout proper permission is illegal and may lead to legal actions.
+//  *
+//  *
+//  **/
+using System;
+namespace skyspot.session
+{
+    public class SessionManager
+    {
+        public SessionManager()
+        {
+        }
+    }
+}