diff --git a/src/core-taggeds-optional/Optional/OptionalExtensions/Comparison/CompareTo.cs b/src/core-taggeds-optional/Optional/OptionalExtensions/CompareTo.cs
similarity index 100%
rename from src/core-taggeds-optional/Optional/OptionalExtensions/Comparison/CompareTo.cs
rename to src/core-taggeds-optional/Optional/OptionalExtensions/CompareTo.cs
diff --git a/src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNull/FilterNotNull.cs b/src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNull.cs
similarity index 100%
rename from src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNull/FilterNotNull.cs
rename to src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNull.cs
diff --git a/src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNullOrThrow/FilterNotNullOrThrow.cs b/src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNullOrThrow.cs
similarity index 100%
rename from src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNullOrThrow/FilterNotNullOrThrow.cs
rename to src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNullOrThrow.cs
diff --git a/src/core-taggeds-optional/Optional/OptionalExtensions/Flatten/Flatten.cs b/src/core-taggeds-optional/Optional/OptionalExtensions/Flatten.cs
similarity index 100%
rename from src/core-taggeds-optional/Optional/OptionalExtensions/Flatten/Flatten.cs
rename to src/core-taggeds-optional/Optional/OptionalExtensions/Flatten.cs
diff --git a/src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNullOrThrow.Inner/InnerExceptionFactories.cs b/src/core-taggeds-optional/Optional/OptionalExtensions/Inner.ExceptionFactories/InnerExceptionFactories.cs
similarity index 100%
rename from src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNullOrThrow.Inner/InnerExceptionFactories.cs
rename to src/core-taggeds-optional/Optional/OptionalExtensions/Inner.ExceptionFactories/InnerExceptionFactories.cs
diff --git a/src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNull.Inner/InnerFilterNotNullMap.cs b/src/core-taggeds-optional/Optional/OptionalExtensions/Inner/InnerFilterNotNullMap.cs
similarity index 100%
rename from src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNull.Inner/InnerFilterNotNullMap.cs
rename to src/core-taggeds-optional/Optional/OptionalExtensions/Inner/InnerFilterNotNullMap.cs
diff --git a/src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNullOrThrow.Inner/InnerFilterNotNullOrThrowMap.cs b/src/core-taggeds-optional/Optional/OptionalExtensions/Inner/InnerFilterNotNullOrThrowMap.cs
similarity index 100%
rename from src/core-taggeds-optional/Optional/OptionalExtensions/FilterNotNullOrThrow.Inner/InnerFilterNotNullOrThrowMap.cs
rename to src/core-taggeds-optional/Optional/OptionalExtensions/Inner/InnerFilterNotNullOrThrowMap.cs