diff --git a/src/EventHub.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/src/EventHub.Domain/Data/IdentityServerDataSeedContributor.cs
similarity index 99%
rename from src/EventHub.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
rename to src/EventHub.Domain/Data/IdentityServerDataSeedContributor.cs
index 58fec54..a1d8d30 100644
--- a/src/EventHub.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
+++ b/src/EventHub.Domain/Data/IdentityServerDataSeedContributor.cs
@@ -18,7 +18,7 @@ using ApiResource = Volo.Abp.IdentityServer.ApiResources.ApiResource;
 using ApiScope = Volo.Abp.IdentityServer.ApiScopes.ApiScope;
 using Client = Volo.Abp.IdentityServer.Clients.Client;
 
-namespace EventHub.IdentityServer
+namespace EventHub.Data
 {
     public class IdentityServerDataSeedContributor : IDataSeedContributor, ITransientDependency
     {
diff --git a/src/EventHub.Domain/Events/Event.cs b/src/EventHub.Domain/Events/Event.cs
index a342bea..2722a27 100644
--- a/src/EventHub.Domain/Events/Event.cs
+++ b/src/EventHub.Domain/Events/Event.cs
@@ -85,29 +85,27 @@ namespace EventHub.Events
             return this;
         }
 
-        public Event SetLocation(bool isOnline, string onlineLink, Guid? countryId, string city)
+        public Event SetLocation(
+            bool isOnline,
+            string onlineLink,
+            Guid? countryId,
+            string city)
         {
             IsOnline = isOnline;
             
-            if (isOnline)
+            if (IsOnline)
             {
-                if (!onlineLink.IsNullOrWhiteSpace())
-                {
-                    OnlineLink = onlineLink;
-                }
-
+                OnlineLink = onlineLink;
                 CountryId = null;
                 City = null;
-                return this;
             }
-            
-            if (countryId.HasValue && !city.IsNullOrWhiteSpace())
+            else
             {
+                OnlineLink = null;
                 CountryId = countryId;
                 City = city;
             }
 
-            OnlineLink = null;
             return this;
         }
     }
diff --git a/src/EventHub.Domain/Events/EventCoverImageContainer.cs b/src/EventHub.Domain/Events/EventCoverImageContainer.cs
index e47884e..35127ed 100644
--- a/src/EventHub.Domain/Events/EventCoverImageContainer.cs
+++ b/src/EventHub.Domain/Events/EventCoverImageContainer.cs
@@ -2,7 +2,7 @@ using Volo.Abp.BlobStoring;
 
 namespace EventHub.Events
 {
-    [BlobContainerName("event-cover-images")]
+    [BlobContainerName("eventhub-event-cover-images")]
     public class EventCoverImageContainer
     {
         
diff --git a/src/EventHub.Domain/Events/EventManager.cs b/src/EventHub.Domain/Events/EventManager.cs
index 1bbb0f1..c43aa31 100644
--- a/src/EventHub.Domain/Events/EventManager.cs
+++ b/src/EventHub.Domain/Events/EventManager.cs
@@ -53,8 +53,7 @@ namespace EventHub.Events
             bool isOnline,
             string onlineLink,
             string city,
-            int? capacity
-            )
+            int? capacity)
         {
             var @event = await _eventRepository.GetAsync(id);
             var registeredUserCount = await _eventRegistrationRepository.CountAsync(x => x.EventId == @event.Id);
diff --git a/src/EventHub.Domain/Organizations/Organization.cs b/src/EventHub.Domain/Organizations/Organization.cs
index d7b2083..88db74b 100644
--- a/src/EventHub.Domain/Organizations/Organization.cs
+++ b/src/EventHub.Domain/Organizations/Organization.cs
@@ -6,7 +6,7 @@ namespace EventHub.Organizations
 {
     public class Organization : FullAuditedAggregateRoot<Guid>
     {
-        public Guid OwnerUserId { get; set; }
+        public Guid OwnerUserId { get; private set; }
 
         public string Name { get; private set; }
 
diff --git a/src/EventHub.Domain/Organizations/OrganizationProfilePictureContainer.cs b/src/EventHub.Domain/Organizations/OrganizationProfilePictureContainer.cs
index 133dc48..f99a747 100644
--- a/src/EventHub.Domain/Organizations/OrganizationProfilePictureContainer.cs
+++ b/src/EventHub.Domain/Organizations/OrganizationProfilePictureContainer.cs
@@ -2,7 +2,7 @@ using Volo.Abp.BlobStoring;
 
 namespace EventHub.Organizations
 {
-    [BlobContainerName("organization-profile-pictures")]
+    [BlobContainerName("eventhub-organization-profile-pictures")]
     public class OrganizationProfilePictureContainer
     {