diff --git a/Customizations/JSON/FromJSON.ts b/Customizations/JSON/FromJSON.ts
index 402a91a08..b583cca25 100644
--- a/Customizations/JSON/FromJSON.ts
+++ b/Customizations/JSON/FromJSON.ts
@@ -1,11 +1,10 @@
 import {AndOrTagConfigJson} from "./TagConfigJson";
-import {Or} from "../../Logic/Or";
-
 import {Utils} from "../../Utils";
-import {TagsFilter} from "../../Logic/TagsFilter";
-import {RegexTag} from "../../Logic/RegexTag";
-import {Tag} from "../../Logic/Tag";
-import {And} from "../../Logic/And";
+import {RegexTag} from "../../Logic/Tags/RegexTag";
+import {Or} from "../../Logic/Tags/Or";
+import {And} from "../../Logic/Tags/And";
+import {Tag} from "../../Logic/Tags/Tag";
+import {TagsFilter} from "../../Logic/Tags/TagsFilter";
 
 export class FromJSON {
 
diff --git a/Customizations/JSON/LayerConfig.ts b/Customizations/JSON/LayerConfig.ts
index 075659160..e83a59a4f 100644
--- a/Customizations/JSON/LayerConfig.ts
+++ b/Customizations/JSON/LayerConfig.ts
@@ -15,8 +15,8 @@ import {FixedUiElement} from "../../UI/Base/FixedUiElement";
 import {UIElement} from "../../UI/UIElement";
 import {SubstitutedTranslation} from "../../UI/SubstitutedTranslation";
 import SourceConfig from "./SourceConfig";
-import {TagsFilter} from "../../Logic/TagsFilter";
-import {Tag} from "../../Logic/Tag";
+import {TagsFilter} from "../../Logic/Tags/TagsFilter";
+import {Tag} from "../../Logic/Tags/Tag";
 
 export default class LayerConfig {
 
diff --git a/Customizations/JSON/LayerConfigJson.ts b/Customizations/JSON/LayerConfigJson.ts
index 335c265ed..630699e98 100644
--- a/Customizations/JSON/LayerConfigJson.ts
+++ b/Customizations/JSON/LayerConfigJson.ts
@@ -1,6 +1,5 @@
 import {TagRenderingConfigJson} from "./TagRenderingConfigJson";
 import {AndOrTagConfigJson} from "./TagConfigJson";
-import TagRenderingConfig from "./TagRenderingConfig";
 
 /**
  * Configuration for a single layer
diff --git a/Customizations/JSON/SourceConfig.ts b/Customizations/JSON/SourceConfig.ts
index 80f4cb7e5..f354ed33d 100644
--- a/Customizations/JSON/SourceConfig.ts
+++ b/Customizations/JSON/SourceConfig.ts
@@ -1,4 +1,4 @@
-import {TagsFilter} from "../../Logic/TagsFilter";
+import {TagsFilter} from "../../Logic/Tags/TagsFilter";
 
 export default class SourceConfig {
 
diff --git a/Customizations/JSON/TagRenderingConfig.ts b/Customizations/JSON/TagRenderingConfig.ts
index ca2cea76e..d634afc30 100644
--- a/Customizations/JSON/TagRenderingConfig.ts
+++ b/Customizations/JSON/TagRenderingConfig.ts
@@ -4,9 +4,9 @@ import {FromJSON} from "./FromJSON";
 import ValidatedTextField from "../../UI/Input/ValidatedTextField";
 import {Translation} from "../../UI/i18n/Translation";
 import {Utils} from "../../Utils";
-import {TagsFilter} from "../../Logic/TagsFilter";
-import {And} from "../../Logic/And";
-import {TagUtils} from "../../Logic/TagUtils";
+import {TagUtils} from "../../Logic/Tags/TagUtils";
+import {And} from "../../Logic/Tags/And";
+import {TagsFilter} from "../../Logic/Tags/TagsFilter";
 
 /***
  * The parsed version of TagRenderingConfigJSON
diff --git a/Logic/Osm/Changes.ts b/Logic/Osm/Changes.ts
index b66162994..a42ffb2f7 100644
--- a/Logic/Osm/Changes.ts
+++ b/Logic/Osm/Changes.ts
@@ -4,9 +4,9 @@ import {Utils} from "../../Utils";
 import {UIEventSource} from "../UIEventSource";
 import Constants from "../../Models/Constants";
 import FeatureSource from "../FeatureSource/FeatureSource";
-import {TagsFilter} from "../TagsFilter";
-import {Tag} from "../Tag";
-import {And} from "../And";
+import {TagsFilter} from "../Tags/TagsFilter";
+import {Tag} from "../Tags/Tag";
+import {And} from "../Tags/And";
 
 /**
  * Handles all changes made to OSM.
diff --git a/Logic/And.ts b/Logic/Tags/And.ts
similarity index 100%
rename from Logic/And.ts
rename to Logic/Tags/And.ts
diff --git a/Logic/Or.ts b/Logic/Tags/Or.ts
similarity index 100%
rename from Logic/Or.ts
rename to Logic/Tags/Or.ts
diff --git a/Logic/RegexTag.ts b/Logic/Tags/RegexTag.ts
similarity index 100%
rename from Logic/RegexTag.ts
rename to Logic/Tags/RegexTag.ts
diff --git a/Logic/Tag.ts b/Logic/Tags/Tag.ts
similarity index 98%
rename from Logic/Tag.ts
rename to Logic/Tags/Tag.ts
index 3519d7e7d..d97c1ddac 100644
--- a/Logic/Tag.ts
+++ b/Logic/Tags/Tag.ts
@@ -1,4 +1,4 @@
-import {Utils} from "../Utils";
+import {Utils} from "../../Utils";
 import {RegexTag} from "./RegexTag";
 import {TagsFilter} from "./TagsFilter";
 import {TagUtils} from "./TagUtils";
diff --git a/Logic/TagUtils.ts b/Logic/Tags/TagUtils.ts
similarity index 99%
rename from Logic/TagUtils.ts
rename to Logic/Tags/TagUtils.ts
index 15c89012e..6fb73f245 100644
--- a/Logic/TagUtils.ts
+++ b/Logic/Tags/TagUtils.ts
@@ -1,7 +1,7 @@
 import {Tag} from "./Tag";
 import {TagsFilter} from "./TagsFilter";
 import {And} from "./And";
-import {Utils} from "../Utils";
+import {Utils} from "../../Utils";
 
 export class TagUtils {
     static ApplyTemplate(template: string, tags: any): string {
diff --git a/Logic/TagsFilter.ts b/Logic/Tags/TagsFilter.ts
similarity index 100%
rename from Logic/TagsFilter.ts
rename to Logic/Tags/TagsFilter.ts
diff --git a/UI/Image/DeleteImage.ts b/UI/Image/DeleteImage.ts
index 0c86c4e3b..2211fb085 100644
--- a/UI/Image/DeleteImage.ts
+++ b/UI/Image/DeleteImage.ts
@@ -5,7 +5,7 @@ import CheckBox from "../Input/CheckBox";
 import Combine from "../Base/Combine";
 import State from "../../State";
 import Svg from "../../Svg";
-import {Tag} from "../../Logic/Tag";
+import {Tag} from "../../Logic/Tags/Tag";
 
 
 export default class DeleteImage extends UIElement {
diff --git a/UI/Image/ImageUploadFlow.ts b/UI/Image/ImageUploadFlow.ts
index 9c43010d1..e6a710a45 100644
--- a/UI/Image/ImageUploadFlow.ts
+++ b/UI/Image/ImageUploadFlow.ts
@@ -8,7 +8,7 @@ import {Imgur} from "../../Logic/Web/Imgur";
 import {DropDown} from "../Input/DropDown";
 import Translations from "../i18n/Translations";
 import Svg from "../../Svg";
-import {Tag} from "../../Logic/Tag";
+import {Tag} from "../../Logic/Tags/Tag";
 
 export class ImageUploadFlow extends UIElement {
     private readonly _licensePicker: UIElement;
diff --git a/UI/Popup/EditableTagRendering.ts b/UI/Popup/EditableTagRendering.ts
index cd8411da6..c4733d8ea 100644
--- a/UI/Popup/EditableTagRendering.ts
+++ b/UI/Popup/EditableTagRendering.ts
@@ -7,7 +7,6 @@ import Combine from "../Base/Combine";
 import TagRenderingAnswer from "./TagRenderingAnswer";
 import State from "../../State";
 import Svg from "../../Svg";
-import {TagUtils} from "../../Logic/TagUtils";
 
 export default class EditableTagRendering extends UIElement {
     private readonly _tags: UIEventSource<any>;
diff --git a/UI/Popup/TagRenderingAnswer.ts b/UI/Popup/TagRenderingAnswer.ts
index 3bf9e42f8..863f0c0a2 100644
--- a/UI/Popup/TagRenderingAnswer.ts
+++ b/UI/Popup/TagRenderingAnswer.ts
@@ -5,7 +5,7 @@ import {Utils} from "../../Utils";
 import Combine from "../Base/Combine";
 import {SubstitutedTranslation} from "../SubstitutedTranslation";
 import {Translation} from "../i18n/Translation";
-import {TagUtils} from "../../Logic/TagUtils";
+import {TagUtils} from "../../Logic/Tags/TagUtils";
 
 /***
  * Displays the correct value for a known tagrendering
diff --git a/UI/Popup/TagRenderingQuestion.ts b/UI/Popup/TagRenderingQuestion.ts
index e34aeb58e..ac6da339c 100644
--- a/UI/Popup/TagRenderingQuestion.ts
+++ b/UI/Popup/TagRenderingQuestion.ts
@@ -18,10 +18,10 @@ import {FixedUiElement} from "../Base/FixedUiElement";
 import {Translation} from "../i18n/Translation";
 import Constants from "../../Models/Constants";
 import {SubstitutedTranslation} from "../SubstitutedTranslation";
-import {TagsFilter} from "../../Logic/TagsFilter";
-import {Tag} from "../../Logic/Tag";
-import {And} from "../../Logic/And";
-import {TagUtils} from "../../Logic/TagUtils";
+import {TagsFilter} from "../../Logic/Tags/TagsFilter";
+import {Tag} from "../../Logic/Tags/Tag";
+import {And} from "../../Logic/Tags/And";
+import {TagUtils} from "../../Logic/Tags/TagUtils";
 
 /**
  * Shows the question element.
diff --git a/test/Tag.spec.ts b/test/Tag.spec.ts
index 3171328be..8b3dab260 100644
--- a/test/Tag.spec.ts
+++ b/test/Tag.spec.ts
@@ -12,8 +12,8 @@ import {Translation} from "../UI/i18n/Translation";
 import {OH, OpeningHour} from "../UI/OpeningHours/OpeningHours";
 import PublicHolidayInput from "../UI/OpeningHours/PublicHolidayInput";
 import {SubstitutedTranslation} from "../UI/SubstitutedTranslation";
-import {Tag} from "../Logic/Tag";
-import {And} from "../Logic/And";
+import {Tag} from "../Logic/Tags/Tag";
+import {And} from "../Logic/Tags/And";
 
 
 new T("Tags", [