diff --git a/src/bcf-converter/Builder/Bcf21/BimSnippetBuilder.cs b/src/bcf-converter/Builder/Bcf21/BimSnippetBuilder.cs
index fb9a0e8..d91d2cc 100644
--- a/src/bcf-converter/Builder/Bcf21/BimSnippetBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/BimSnippetBuilder.cs
@@ -1,6 +1,7 @@
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public class BimSnippetBuilder : IBimSnippetBuilder<BimSnippetBuilder> {
   private readonly BimSnippet _snippet = new();
diff --git a/src/bcf-converter/Builder/Bcf21/BitmapBuilder.cs b/src/bcf-converter/Builder/Bcf21/BitmapBuilder.cs
index 47aab14..16f5896 100644
--- a/src/bcf-converter/Builder/Bcf21/BitmapBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/BitmapBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public class BitmapBuilder : IBitmapBuilder<BitmapBuilder> {
   private readonly VisualizationInfoBitmap _bitmap = new();
diff --git a/src/bcf-converter/Builder/Bcf21/CameraBuilder.cs b/src/bcf-converter/Builder/Bcf21/CameraBuilder.cs
index 58f0d93..c91a103 100644
--- a/src/bcf-converter/Builder/Bcf21/CameraBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/CameraBuilder.cs
@@ -1,6 +1,7 @@
-using bcf.bcf21;
 
-namespace bcf.Builder.Bcf21;
+using BcfConverter.Model.Bcf21;
+
+namespace BcfConverter.Builder.Bcf21;
 
 public class CameraBuilder : ICameraBuilder {
   private readonly Direction _direction = new();
diff --git a/src/bcf-converter/Builder/Bcf21/ClippingPlaneBuilder.cs b/src/bcf-converter/Builder/Bcf21/ClippingPlaneBuilder.cs
index e9a3ed4..d7b48a4 100644
--- a/src/bcf-converter/Builder/Bcf21/ClippingPlaneBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/ClippingPlaneBuilder.cs
@@ -1,6 +1,8 @@
-using bcf.bcf21;
 
-namespace bcf.Builder.Bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
+
+namespace BcfConverter.Builder.Bcf21;
 
 public class ClippingPlaneBuilder :
   IClippingPlaneBuilder<ClippingPlaneBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf21/ColorBuilder.cs b/src/bcf-converter/Builder/Bcf21/ColorBuilder.cs
index 2ea0c80..0a257d6 100644
--- a/src/bcf-converter/Builder/Bcf21/ColorBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/ColorBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public class ColorBuilder : IColorBuilder<ColorBuilder, ComponentBuilder> {
   private readonly ComponentColoringColor _color = new();
diff --git a/src/bcf-converter/Builder/Bcf21/CommentBuilder.cs b/src/bcf-converter/Builder/Bcf21/CommentBuilder.cs
index 92c28e8..bc6d167 100644
--- a/src/bcf-converter/Builder/Bcf21/CommentBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/CommentBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public class CommentBuilder : ICommentBuilder<CommentBuilder> {
   private readonly Comment _comment = new();
diff --git a/src/bcf-converter/Builder/Bcf21/ComponentBuilder.cs b/src/bcf-converter/Builder/Bcf21/ComponentBuilder.cs
index c3767ff..5e754a3 100644
--- a/src/bcf-converter/Builder/Bcf21/ComponentBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/ComponentBuilder.cs
@@ -1,6 +1,7 @@
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public class ComponentBuilder : IComponentBuilder<ComponentBuilder> {
   private readonly Component _component = new();
diff --git a/src/bcf-converter/Builder/Bcf21/DocumentReferenceBuilder.cs b/src/bcf-converter/Builder/Bcf21/DocumentReferenceBuilder.cs
index 3b3130a..0c42830 100644
--- a/src/bcf-converter/Builder/Bcf21/DocumentReferenceBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/DocumentReferenceBuilder.cs
@@ -1,6 +1,8 @@
-using bcf.bcf21;
 
-namespace bcf.Builder.Bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
+
+namespace BcfConverter.Builder.Bcf21;
 
 public partial class DocumentReferenceBuilder :
   IDocumentReferenceBuilder<DocumentReferenceBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf21/DocumentReferenceBuilderExtensions.cs b/src/bcf-converter/Builder/Bcf21/DocumentReferenceBuilderExtensions.cs
index 08a2745..75ec840 100644
--- a/src/bcf-converter/Builder/Bcf21/DocumentReferenceBuilderExtensions.cs
+++ b/src/bcf-converter/Builder/Bcf21/DocumentReferenceBuilderExtensions.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public partial class DocumentReferenceBuilder :
   IDocumentReferenceBuilderExtension<DocumentReferenceBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf21/HeaderFileBuilder.cs b/src/bcf-converter/Builder/Bcf21/HeaderFileBuilder.cs
index 41de8f1..c9e13f9 100644
--- a/src/bcf-converter/Builder/Bcf21/HeaderFileBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/HeaderFileBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public class HeaderFileBuilder : IHeaderFileBuilder<HeaderFileBuilder> {
   private readonly HeaderFile _file = new();
diff --git a/src/bcf-converter/Builder/Bcf21/IDocumentReferenceBuilderExtension.cs b/src/bcf-converter/Builder/Bcf21/IDocumentReferenceBuilderExtension.cs
index 4fcd882..1711744 100644
--- a/src/bcf-converter/Builder/Bcf21/IDocumentReferenceBuilderExtension.cs
+++ b/src/bcf-converter/Builder/Bcf21/IDocumentReferenceBuilderExtension.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public interface IDocumentReferenceBuilderExtension<out TBuilder> {
   TBuilder AddIsExternal(bool isExternal);
diff --git a/src/bcf-converter/Builder/Bcf21/IProjectBuilderExtension.cs b/src/bcf-converter/Builder/Bcf21/IProjectBuilderExtension.cs
index be15c08..2492ab6 100644
--- a/src/bcf-converter/Builder/Bcf21/IProjectBuilderExtension.cs
+++ b/src/bcf-converter/Builder/Bcf21/IProjectBuilderExtension.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public interface IProjectBuilderExtension<out TBuilder> {
   TBuilder AddExtensionSchema(string schema);
diff --git a/src/bcf-converter/Builder/Bcf21/IVersionBuilderExtension.cs b/src/bcf-converter/Builder/Bcf21/IVersionBuilderExtension.cs
index 917a896..ed50866 100644
--- a/src/bcf-converter/Builder/Bcf21/IVersionBuilderExtension.cs
+++ b/src/bcf-converter/Builder/Bcf21/IVersionBuilderExtension.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public interface IVersionBuilderExtension<out TBuilder> {
   TBuilder AddDetailedVersion(string version);
diff --git a/src/bcf-converter/Builder/Bcf21/IViewPointBuilderExtension.cs b/src/bcf-converter/Builder/Bcf21/IViewPointBuilderExtension.cs
index 65c413b..bf3f3cd 100644
--- a/src/bcf-converter/Builder/Bcf21/IViewPointBuilderExtension.cs
+++ b/src/bcf-converter/Builder/Bcf21/IViewPointBuilderExtension.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public interface IViewPointBuilderExtension<
   out TBuilder,
diff --git a/src/bcf-converter/Builder/Bcf21/LineBuilder.cs b/src/bcf-converter/Builder/Bcf21/LineBuilder.cs
index ee1c5f7..0d81f19 100644
--- a/src/bcf-converter/Builder/Bcf21/LineBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/LineBuilder.cs
@@ -1,6 +1,8 @@
-using bcf.bcf21;
 
-namespace bcf.Builder.Bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
+
+namespace BcfConverter.Builder.Bcf21;
 
 public class LineBuilder : ILineBuilder<LineBuilder> {
   private readonly Line _line = new();
diff --git a/src/bcf-converter/Builder/Bcf21/MarkupBuilder.cs b/src/bcf-converter/Builder/Bcf21/MarkupBuilder.cs
index c7bc0e1..a1cc998 100644
--- a/src/bcf-converter/Builder/Bcf21/MarkupBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/MarkupBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public class MarkupBuilder :
   IMarkupBuilder<
diff --git a/src/bcf-converter/Builder/Bcf21/OrthogonalCameraBuilder.cs b/src/bcf-converter/Builder/Bcf21/OrthogonalCameraBuilder.cs
index 50e86e9..d88df4a 100644
--- a/src/bcf-converter/Builder/Bcf21/OrthogonalCameraBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/OrthogonalCameraBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public class OrthogonalCameraBuilder :
   IOrthogonalCameraBuilder<OrthogonalCameraBuilder, CameraBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf21/PerspectiveCameraBuilder.cs b/src/bcf-converter/Builder/Bcf21/PerspectiveCameraBuilder.cs
index a08d09f..dea64f9 100644
--- a/src/bcf-converter/Builder/Bcf21/PerspectiveCameraBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/PerspectiveCameraBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public class PerspectiveCameraBuilder :
   IPerspectiveCameraBuilder<PerspectiveCameraBuilder, CameraBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf21/ProjectBuilder.cs b/src/bcf-converter/Builder/Bcf21/ProjectBuilder.cs
index 6ce1c08..9734d7c 100644
--- a/src/bcf-converter/Builder/Bcf21/ProjectBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/ProjectBuilder.cs
@@ -1,6 +1,7 @@
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public partial class ProjectBuilder : IProjectBuilder<ProjectBuilder> {
   private readonly ProjectExtension _project = new();
diff --git a/src/bcf-converter/Builder/Bcf21/ProjectBuilderExtensions.cs b/src/bcf-converter/Builder/Bcf21/ProjectBuilderExtensions.cs
index 0abbdaf..fdb49e1 100644
--- a/src/bcf-converter/Builder/Bcf21/ProjectBuilderExtensions.cs
+++ b/src/bcf-converter/Builder/Bcf21/ProjectBuilderExtensions.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public partial class ProjectBuilder : IProjectBuilderExtension<ProjectBuilder> {
   public ProjectBuilder AddExtensionSchema(string schema) {
diff --git a/src/bcf-converter/Builder/Bcf21/VersionBuilder.cs b/src/bcf-converter/Builder/Bcf21/VersionBuilder.cs
index 632767c..b34c91d 100644
--- a/src/bcf-converter/Builder/Bcf21/VersionBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/VersionBuilder.cs
@@ -1,6 +1,7 @@
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public partial class VersionBuilder : IVersionBuilder<VersionBuilder> {
   private readonly Version _version = new();
diff --git a/src/bcf-converter/Builder/Bcf21/VersionBuilderExtensions.cs b/src/bcf-converter/Builder/Bcf21/VersionBuilderExtensions.cs
index a8fad83..a448935 100644
--- a/src/bcf-converter/Builder/Bcf21/VersionBuilderExtensions.cs
+++ b/src/bcf-converter/Builder/Bcf21/VersionBuilderExtensions.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public partial class VersionBuilder : IVersionBuilderExtension<VersionBuilder> {
   public VersionBuilder AddDetailedVersion(string version) {
diff --git a/src/bcf-converter/Builder/Bcf21/ViewPointBuilder.cs b/src/bcf-converter/Builder/Bcf21/ViewPointBuilder.cs
index ecebb6b..48c7bfa 100644
--- a/src/bcf-converter/Builder/Bcf21/ViewPointBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/ViewPointBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public partial class ViewPointBuilder :
   IViewPointBuilder<
diff --git a/src/bcf-converter/Builder/Bcf21/ViewPointBuilderExtensions.cs b/src/bcf-converter/Builder/Bcf21/ViewPointBuilderExtensions.cs
index a75e7d3..9ddfe78 100644
--- a/src/bcf-converter/Builder/Bcf21/ViewPointBuilderExtensions.cs
+++ b/src/bcf-converter/Builder/Bcf21/ViewPointBuilderExtensions.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public partial class ViewPointBuilder :
   IViewPointBuilderExtension<ViewPointBuilder, ViewSetupHintsBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf21/ViewSetupHintsBuilder.cs b/src/bcf-converter/Builder/Bcf21/ViewSetupHintsBuilder.cs
index ad242b7..6ac6515 100644
--- a/src/bcf-converter/Builder/Bcf21/ViewSetupHintsBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/ViewSetupHintsBuilder.cs
@@ -1,6 +1,8 @@
-using bcf.bcf21;
 
-namespace bcf.Builder.Bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
+
+namespace BcfConverter.Builder.Bcf21;
 
 public class ViewSetupHintsBuilder :
   IViewSetupHintsBuilder<ViewSetupHintsBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf21/VisibilityBuilder.cs b/src/bcf-converter/Builder/Bcf21/VisibilityBuilder.cs
index 5c196a2..a66f528 100644
--- a/src/bcf-converter/Builder/Bcf21/VisibilityBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf21/VisibilityBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf21;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Builder.Bcf21;
+namespace BcfConverter.Builder.Bcf21;
 
 public class VisibilityBuilder :
   IVisibilityBuilder<VisibilityBuilder, ComponentBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf30/BimSnippetBuilder.cs b/src/bcf-converter/Builder/Bcf30/BimSnippetBuilder.cs
index 630e74a..412bbb1 100644
--- a/src/bcf-converter/Builder/Bcf30/BimSnippetBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/BimSnippetBuilder.cs
@@ -1,6 +1,8 @@
-using bcf.bcf30;
 
-namespace bcf.Builder.Bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
+
+namespace BcfConverter.Builder.Bcf30;
 
 public class BimSnippetBuilder : IBimSnippetBuilder<BimSnippetBuilder> {
   private readonly BimSnippet _snippet = new();
diff --git a/src/bcf-converter/Builder/Bcf30/BitmapBuilder.cs b/src/bcf-converter/Builder/Bcf30/BitmapBuilder.cs
index d4ae964..9fc0e3a 100644
--- a/src/bcf-converter/Builder/Bcf30/BitmapBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/BitmapBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public class BitmapBuilder : IBitmapBuilder<BitmapBuilder> {
   private readonly Bitmap _bitmap = new();
diff --git a/src/bcf-converter/Builder/Bcf30/CameraBuilder.cs b/src/bcf-converter/Builder/Bcf30/CameraBuilder.cs
index d9106b9..bc74463 100644
--- a/src/bcf-converter/Builder/Bcf30/CameraBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/CameraBuilder.cs
@@ -1,6 +1,6 @@
-using bcf.bcf30;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public class CameraBuilder : ICameraBuilder {
   private readonly Direction _direction = new();
diff --git a/src/bcf-converter/Builder/Bcf30/ClippingPlaneBuilder.cs b/src/bcf-converter/Builder/Bcf30/ClippingPlaneBuilder.cs
index a171737..099cafb 100644
--- a/src/bcf-converter/Builder/Bcf30/ClippingPlaneBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/ClippingPlaneBuilder.cs
@@ -1,6 +1,7 @@
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public class ClippingPlaneBuilder :
   IClippingPlaneBuilder<ClippingPlaneBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf30/ColorBuilder.cs b/src/bcf-converter/Builder/Bcf30/ColorBuilder.cs
index 2687e61..b7921c3 100644
--- a/src/bcf-converter/Builder/Bcf30/ColorBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/ColorBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public class ColorBuilder : IColorBuilder<ColorBuilder, ComponentBuilder> {
   private readonly ComponentColoringColor _color = new();
diff --git a/src/bcf-converter/Builder/Bcf30/CommentBuilder.cs b/src/bcf-converter/Builder/Bcf30/CommentBuilder.cs
index 4842d1b..90f7d20 100644
--- a/src/bcf-converter/Builder/Bcf30/CommentBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/CommentBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public class CommentBuilder : ICommentBuilder<CommentBuilder> {
   private readonly Comment _comment = new();
diff --git a/src/bcf-converter/Builder/Bcf30/ComponentBuilder.cs b/src/bcf-converter/Builder/Bcf30/ComponentBuilder.cs
index fc01f2f..bf94414 100644
--- a/src/bcf-converter/Builder/Bcf30/ComponentBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/ComponentBuilder.cs
@@ -1,6 +1,8 @@
-using bcf.bcf30;
 
-namespace bcf.Builder.Bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
+
+namespace BcfConverter.Builder.Bcf30;
 
 public class ComponentBuilder : IComponentBuilder<ComponentBuilder> {
   private readonly Component _component = new();
diff --git a/src/bcf-converter/Builder/Bcf30/DocumentBuilder.cs b/src/bcf-converter/Builder/Bcf30/DocumentBuilder.cs
index 7bb31bf..63c5950 100644
--- a/src/bcf-converter/Builder/Bcf30/DocumentBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/DocumentBuilder.cs
@@ -1,6 +1,7 @@
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public class DocumentBuilder : IDocumentBuilder<DocumentBuilder> {
   private readonly Document _document = new();
diff --git a/src/bcf-converter/Builder/Bcf30/DocumentInfoBuilder.cs b/src/bcf-converter/Builder/Bcf30/DocumentInfoBuilder.cs
index 838398a..a10ba9a 100644
--- a/src/bcf-converter/Builder/Bcf30/DocumentInfoBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/DocumentInfoBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public class DocumentInfoBuilder : IDocumentInfoBuilder<DocumentInfoBuilder, DocumentBuilder> {
   private readonly DocumentInfo _documentInfo = new();
diff --git a/src/bcf-converter/Builder/Bcf30/DocumentReferenceBuilder.cs b/src/bcf-converter/Builder/Bcf30/DocumentReferenceBuilder.cs
index 4b24efb..04b40e1 100644
--- a/src/bcf-converter/Builder/Bcf30/DocumentReferenceBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/DocumentReferenceBuilder.cs
@@ -1,6 +1,8 @@
-using bcf.bcf30;
 
-namespace bcf.Builder.Bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
+
+namespace BcfConverter.Builder.Bcf30;
 
 public partial class DocumentReferenceBuilder :
   IDocumentReferenceBuilder<DocumentReferenceBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf30/DocumentReferenceBuilderExtensions.cs b/src/bcf-converter/Builder/Bcf30/DocumentReferenceBuilderExtensions.cs
index c80f2c3..30e3fc8 100644
--- a/src/bcf-converter/Builder/Bcf30/DocumentReferenceBuilderExtensions.cs
+++ b/src/bcf-converter/Builder/Bcf30/DocumentReferenceBuilderExtensions.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public partial class DocumentReferenceBuilder :
   IDocumentReferenceBuilderExtension<DocumentReferenceBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf30/ExtensionsBuilder.cs b/src/bcf-converter/Builder/Bcf30/ExtensionsBuilder.cs
index 492d6fd..e49da99 100644
--- a/src/bcf-converter/Builder/Bcf30/ExtensionsBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/ExtensionsBuilder.cs
@@ -1,6 +1,8 @@
-using bcf.bcf30;
 
-namespace bcf.Builder.Bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
+
+namespace BcfConverter.Builder.Bcf30;
 
 public class ExtensionsBuilder : IExtensionsBuilder<ExtensionsBuilder> {
   private readonly Extensions _extensions = new();
diff --git a/src/bcf-converter/Builder/Bcf30/HeaderFileBuilder.cs b/src/bcf-converter/Builder/Bcf30/HeaderFileBuilder.cs
index bfe89e0..49a0d73 100644
--- a/src/bcf-converter/Builder/Bcf30/HeaderFileBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/HeaderFileBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public class HeaderFileBuilder : IHeaderFileBuilder<HeaderFileBuilder> {
   private readonly File _file = new();
diff --git a/src/bcf-converter/Builder/Bcf30/IDocumentReferenceBuilderExtension.cs b/src/bcf-converter/Builder/Bcf30/IDocumentReferenceBuilderExtension.cs
index 10ac055..c94156e 100644
--- a/src/bcf-converter/Builder/Bcf30/IDocumentReferenceBuilderExtension.cs
+++ b/src/bcf-converter/Builder/Bcf30/IDocumentReferenceBuilderExtension.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public interface IDocumentReferenceBuilderExtension<out TBuilder> {
   TBuilder AddDocumentGuid(string guid);
diff --git a/src/bcf-converter/Builder/Bcf30/IMarkupBuilderExtension.cs b/src/bcf-converter/Builder/Bcf30/IMarkupBuilderExtension.cs
index 3eb45f3..c5225ee 100644
--- a/src/bcf-converter/Builder/Bcf30/IMarkupBuilderExtension.cs
+++ b/src/bcf-converter/Builder/Bcf30/IMarkupBuilderExtension.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public interface IMarkupBuilderExtension<out TBuilder> {
   TBuilder AddServerAssignedId(string id);
diff --git a/src/bcf-converter/Builder/Bcf30/IOrthogonalCameraBuilderExtension.cs b/src/bcf-converter/Builder/Bcf30/IOrthogonalCameraBuilderExtension.cs
index 1ba00ec..7909e4f 100644
--- a/src/bcf-converter/Builder/Bcf30/IOrthogonalCameraBuilderExtension.cs
+++ b/src/bcf-converter/Builder/Bcf30/IOrthogonalCameraBuilderExtension.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public interface IOrthogonalCameraBuilderExtension<out TBuilder> {
   TBuilder AddAspectRatio(double ratio);
diff --git a/src/bcf-converter/Builder/Bcf30/IPerspectiveCameraBuilderExtension.cs b/src/bcf-converter/Builder/Bcf30/IPerspectiveCameraBuilderExtension.cs
index 35288e5..8e38b65 100644
--- a/src/bcf-converter/Builder/Bcf30/IPerspectiveCameraBuilderExtension.cs
+++ b/src/bcf-converter/Builder/Bcf30/IPerspectiveCameraBuilderExtension.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public interface IPerspectiveCameraBuilderExtension<out TBuilder> {
   TBuilder AddAspectRatio(double ratio);
diff --git a/src/bcf-converter/Builder/Bcf30/IVisibilityBuilderExtension.cs b/src/bcf-converter/Builder/Bcf30/IVisibilityBuilderExtension.cs
index 9f8a26a..74bd730 100644
--- a/src/bcf-converter/Builder/Bcf30/IVisibilityBuilderExtension.cs
+++ b/src/bcf-converter/Builder/Bcf30/IVisibilityBuilderExtension.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public interface IVisibilityBuilderExtension<
   out TBuilder,
diff --git a/src/bcf-converter/Builder/Bcf30/LineBuilder.cs b/src/bcf-converter/Builder/Bcf30/LineBuilder.cs
index 1d520aa..cdaeaaf 100644
--- a/src/bcf-converter/Builder/Bcf30/LineBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/LineBuilder.cs
@@ -1,6 +1,8 @@
-using bcf.bcf30;
 
-namespace bcf.Builder.Bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
+
+namespace BcfConverter.Builder.Bcf30;
 
 public class LineBuilder : ILineBuilder<LineBuilder> {
   private readonly Line _line = new();
diff --git a/src/bcf-converter/Builder/Bcf30/MarkupBuilder.cs b/src/bcf-converter/Builder/Bcf30/MarkupBuilder.cs
index c7e3622..cd8d038 100644
--- a/src/bcf-converter/Builder/Bcf30/MarkupBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/MarkupBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public partial class MarkupBuilder :
   IMarkupBuilder<
diff --git a/src/bcf-converter/Builder/Bcf30/MarkupBuilderExensions.cs b/src/bcf-converter/Builder/Bcf30/MarkupBuilderExensions.cs
index 55c48e4..ae01bed 100644
--- a/src/bcf-converter/Builder/Bcf30/MarkupBuilderExensions.cs
+++ b/src/bcf-converter/Builder/Bcf30/MarkupBuilderExensions.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public partial class MarkupBuilder : IMarkupBuilderExtension<MarkupBuilder> {
   public MarkupBuilder AddServerAssignedId(string id) {
diff --git a/src/bcf-converter/Builder/Bcf30/OrthogonalCameraBuilder.cs b/src/bcf-converter/Builder/Bcf30/OrthogonalCameraBuilder.cs
index 095c243..1ca174a 100644
--- a/src/bcf-converter/Builder/Bcf30/OrthogonalCameraBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/OrthogonalCameraBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public partial class OrthogonalCameraBuilder :
   IOrthogonalCameraBuilder<OrthogonalCameraBuilder, CameraBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf30/OrthogonalCameraBuilderExtensions.cs b/src/bcf-converter/Builder/Bcf30/OrthogonalCameraBuilderExtensions.cs
index 685a660..112be0b 100644
--- a/src/bcf-converter/Builder/Bcf30/OrthogonalCameraBuilderExtensions.cs
+++ b/src/bcf-converter/Builder/Bcf30/OrthogonalCameraBuilderExtensions.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public partial class OrthogonalCameraBuilder :
   IOrthogonalCameraBuilderExtension<OrthogonalCameraBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf30/PerspectiveCameraBuilder.cs b/src/bcf-converter/Builder/Bcf30/PerspectiveCameraBuilder.cs
index fe13546..a41d504 100644
--- a/src/bcf-converter/Builder/Bcf30/PerspectiveCameraBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/PerspectiveCameraBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public partial class PerspectiveCameraBuilder :
   IPerspectiveCameraBuilder<PerspectiveCameraBuilder, CameraBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf30/PerspectiveCameraBuilderExtensions.cs b/src/bcf-converter/Builder/Bcf30/PerspectiveCameraBuilderExtensions.cs
index db985b5..c0736d2 100644
--- a/src/bcf-converter/Builder/Bcf30/PerspectiveCameraBuilderExtensions.cs
+++ b/src/bcf-converter/Builder/Bcf30/PerspectiveCameraBuilderExtensions.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public partial class PerspectiveCameraBuilder :
   IPerspectiveCameraBuilderExtension<PerspectiveCameraBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf30/ProjectBuilder.cs b/src/bcf-converter/Builder/Bcf30/ProjectBuilder.cs
index 10d5dc4..564db71 100644
--- a/src/bcf-converter/Builder/Bcf30/ProjectBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/ProjectBuilder.cs
@@ -1,6 +1,8 @@
-using bcf.bcf30;
 
-namespace bcf.Builder.Bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
+
+namespace BcfConverter.Builder.Bcf30;
 
 public class ProjectBuilder : IProjectBuilder<ProjectBuilder> {
   private readonly ProjectInfo _project = new();
diff --git a/src/bcf-converter/Builder/Bcf30/VersionBuilder.cs b/src/bcf-converter/Builder/Bcf30/VersionBuilder.cs
index fdba450..084a308 100644
--- a/src/bcf-converter/Builder/Bcf30/VersionBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/VersionBuilder.cs
@@ -1,6 +1,8 @@
-using bcf.bcf30;
 
-namespace bcf.Builder.Bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
+
+namespace BcfConverter.Builder.Bcf30;
 
 public class VersionBuilder : IVersionBuilder<VersionBuilder> {
   private readonly Version _version = new();
diff --git a/src/bcf-converter/Builder/Bcf30/ViewPointBuilder.cs b/src/bcf-converter/Builder/Bcf30/ViewPointBuilder.cs
index a12abdc..a277372 100644
--- a/src/bcf-converter/Builder/Bcf30/ViewPointBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/ViewPointBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public class ViewPointBuilder :
   IViewPointBuilder<
diff --git a/src/bcf-converter/Builder/Bcf30/ViewSetupHintsBuilder.cs b/src/bcf-converter/Builder/Bcf30/ViewSetupHintsBuilder.cs
index d499a25..b650f75 100644
--- a/src/bcf-converter/Builder/Bcf30/ViewSetupHintsBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/ViewSetupHintsBuilder.cs
@@ -1,6 +1,8 @@
-using bcf.bcf30;
 
-namespace bcf.Builder.Bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
+
+namespace BcfConverter.Builder.Bcf30;
 
 public class ViewSetupHintsBuilder :
   IViewSetupHintsBuilder<ViewSetupHintsBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf30/VisibilityBuilder.cs b/src/bcf-converter/Builder/Bcf30/VisibilityBuilder.cs
index 42ecfb6..59842ab 100644
--- a/src/bcf-converter/Builder/Bcf30/VisibilityBuilder.cs
+++ b/src/bcf-converter/Builder/Bcf30/VisibilityBuilder.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public partial class VisibilityBuilder :
   IVisibilityBuilder<VisibilityBuilder, ComponentBuilder> {
diff --git a/src/bcf-converter/Builder/Bcf30/VisibilityBuilderExtensions.cs b/src/bcf-converter/Builder/Bcf30/VisibilityBuilderExtensions.cs
index 0847ac7..6e02c76 100644
--- a/src/bcf-converter/Builder/Bcf30/VisibilityBuilderExtensions.cs
+++ b/src/bcf-converter/Builder/Bcf30/VisibilityBuilderExtensions.cs
@@ -1,7 +1,8 @@
 using System;
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Builder.Bcf30;
+namespace BcfConverter.Builder.Bcf30;
 
 public partial class VisibilityBuilder :
   IVisibilityBuilderExtension<VisibilityBuilder, ViewSetupHintsBuilder> {
diff --git a/src/bcf-converter/Builder/BuilderUtils.cs b/src/bcf-converter/Builder/BuilderUtils.cs
index b6b4716..c3d9616 100644
--- a/src/bcf-converter/Builder/BuilderUtils.cs
+++ b/src/bcf-converter/Builder/BuilderUtils.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public static class BuilderUtils {
   public static TItem BuildItem<TBuilder, TItem>(Action<TBuilder> itemBuilder)
diff --git a/src/bcf-converter/Builder/IBimSnippetBuilder.cs b/src/bcf-converter/Builder/IBimSnippetBuilder.cs
index b72eddb..0f6cfc1 100644
--- a/src/bcf-converter/Builder/IBimSnippetBuilder.cs
+++ b/src/bcf-converter/Builder/IBimSnippetBuilder.cs
@@ -1,4 +1,6 @@
-namespace bcf.Builder;
+using BcfConverter.Model;
+
+namespace BcfConverter.Builder;
 
 public interface IBimSnippetBuilder<out TBuilder> : IBuilder<IBimSnippet> {
   TBuilder AddSnippetType(string type);
diff --git a/src/bcf-converter/Builder/IBitmapBuilder.cs b/src/bcf-converter/Builder/IBitmapBuilder.cs
index a70b39e..1ae411c 100644
--- a/src/bcf-converter/Builder/IBitmapBuilder.cs
+++ b/src/bcf-converter/Builder/IBitmapBuilder.cs
@@ -1,4 +1,6 @@
-namespace bcf.Builder;
+using BcfConverter.Model;
+
+namespace BcfConverter.Builder;
 
 public interface IBitmapBuilder<out TBuilder> : IBuilder<IBitmap> {
   TBuilder AddFormat(string format);
diff --git a/src/bcf-converter/Builder/IBuilder.cs b/src/bcf-converter/Builder/IBuilder.cs
index 6decb03..58983af 100644
--- a/src/bcf-converter/Builder/IBuilder.cs
+++ b/src/bcf-converter/Builder/IBuilder.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public interface IBuilder<out TItem> {
   TItem Build();
diff --git a/src/bcf-converter/Builder/ICameraBuilder.cs b/src/bcf-converter/Builder/ICameraBuilder.cs
index 3564392..9bf3abd 100644
--- a/src/bcf-converter/Builder/ICameraBuilder.cs
+++ b/src/bcf-converter/Builder/ICameraBuilder.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public interface ICameraBuilder : IBuilder<object> {
   ICameraBuilder AddViewPoint(double x, double y, double z);
diff --git a/src/bcf-converter/Builder/IClippingPlaneBuilder.cs b/src/bcf-converter/Builder/IClippingPlaneBuilder.cs
index 726ddfc..832c647 100644
--- a/src/bcf-converter/Builder/IClippingPlaneBuilder.cs
+++ b/src/bcf-converter/Builder/IClippingPlaneBuilder.cs
@@ -1,4 +1,6 @@
-namespace bcf.Builder;
+using BcfConverter.Model;
+
+namespace BcfConverter.Builder;
 
 public interface IClippingPlaneBuilder<out TBuilder> :
   IBuilder<IClippingPlane> {
diff --git a/src/bcf-converter/Builder/IColorBuilder.cs b/src/bcf-converter/Builder/IColorBuilder.cs
index cf453dd..29c5599 100644
--- a/src/bcf-converter/Builder/IColorBuilder.cs
+++ b/src/bcf-converter/Builder/IColorBuilder.cs
@@ -1,6 +1,7 @@
 using System;
+using BcfConverter.Model;
 
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public interface
   IColorBuilder<out TBuilder, out TComponentBuilder> : IBuilder<IColor> {
diff --git a/src/bcf-converter/Builder/ICommentBuilder.cs b/src/bcf-converter/Builder/ICommentBuilder.cs
index 1f71e98..ba5d336 100644
--- a/src/bcf-converter/Builder/ICommentBuilder.cs
+++ b/src/bcf-converter/Builder/ICommentBuilder.cs
@@ -1,6 +1,7 @@
 using System;
+using BcfConverter.Model;
 
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public interface ICommentBuilder<out TBuilder> : IBuilder<IComment> {
   TBuilder AddDate(DateTime date);
diff --git a/src/bcf-converter/Builder/IComponentBuilder.cs b/src/bcf-converter/Builder/IComponentBuilder.cs
index d324ed5..67bbd93 100644
--- a/src/bcf-converter/Builder/IComponentBuilder.cs
+++ b/src/bcf-converter/Builder/IComponentBuilder.cs
@@ -1,4 +1,6 @@
-namespace bcf.Builder;
+using BcfConverter.Model;
+
+namespace BcfConverter.Builder;
 
 public interface IComponentBuilder<out TBuilder> : IBuilder<IComponent> {
   TBuilder AddIfcGuid(string guid);
diff --git a/src/bcf-converter/Builder/IDocumentBuilder.cs b/src/bcf-converter/Builder/IDocumentBuilder.cs
index 7abec9e..953b930 100644
--- a/src/bcf-converter/Builder/IDocumentBuilder.cs
+++ b/src/bcf-converter/Builder/IDocumentBuilder.cs
@@ -1,4 +1,6 @@
-namespace bcf.Builder;
+using BcfConverter.Model;
+
+namespace BcfConverter.Builder;
 
 public interface IDocumentBuilder<out TBuilder> : IBuilder<IDocument> {
   TBuilder AddGuid(string guid);
diff --git a/src/bcf-converter/Builder/IDocumentInfoBuilder.cs b/src/bcf-converter/Builder/IDocumentInfoBuilder.cs
index 8c60cc0..bd50c43 100644
--- a/src/bcf-converter/Builder/IDocumentInfoBuilder.cs
+++ b/src/bcf-converter/Builder/IDocumentInfoBuilder.cs
@@ -1,6 +1,7 @@
 using System;
+using BcfConverter.Model;
 
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public interface IDocumentInfoBuilder<out TBuilder, out TDocumentBuilder> : IBuilder<IDocumentInfo> {
   TBuilder AddDocument(Action<TDocumentBuilder> builder);
diff --git a/src/bcf-converter/Builder/IDocumentReferenceBuilder.cs b/src/bcf-converter/Builder/IDocumentReferenceBuilder.cs
index f20eb33..80cf7e2 100644
--- a/src/bcf-converter/Builder/IDocumentReferenceBuilder.cs
+++ b/src/bcf-converter/Builder/IDocumentReferenceBuilder.cs
@@ -1,4 +1,6 @@
-namespace bcf.Builder;
+using BcfConverter.Model;
+
+namespace BcfConverter.Builder;
 
 public interface
   IDocumentReferenceBuilder<out TBuilder> : IBuilder<IDocReference> {
diff --git a/src/bcf-converter/Builder/IExtensionsBuilder.cs b/src/bcf-converter/Builder/IExtensionsBuilder.cs
index c29cca1..f1d7007 100644
--- a/src/bcf-converter/Builder/IExtensionsBuilder.cs
+++ b/src/bcf-converter/Builder/IExtensionsBuilder.cs
@@ -1,4 +1,6 @@
-namespace bcf.Builder;
+using BcfConverter.Model;
+
+namespace BcfConverter.Builder;
 
 public interface IExtensionsBuilder<out TBuilder> : IBuilder<IExtensions> {
   TBuilder AddTopicType(string type);
diff --git a/src/bcf-converter/Builder/IHeaderFileBuilder.cs b/src/bcf-converter/Builder/IHeaderFileBuilder.cs
index b0e529b..8684a74 100644
--- a/src/bcf-converter/Builder/IHeaderFileBuilder.cs
+++ b/src/bcf-converter/Builder/IHeaderFileBuilder.cs
@@ -1,6 +1,7 @@
 using System;
+using BcfConverter.Model;
 
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public interface IHeaderFileBuilder<out TBuilder> : IBuilder<IHeaderFile> {
   TBuilder AddIfcProject(string id);
diff --git a/src/bcf-converter/Builder/ILineBuilder.cs b/src/bcf-converter/Builder/ILineBuilder.cs
index 33196d4..d9dd898 100644
--- a/src/bcf-converter/Builder/ILineBuilder.cs
+++ b/src/bcf-converter/Builder/ILineBuilder.cs
@@ -1,4 +1,6 @@
-namespace bcf.Builder;
+using BcfConverter.Model;
+
+namespace BcfConverter.Builder;
 
 public interface ILineBuilder<out TBuilder> : IBuilder<ILine> {
   TBuilder AddStartPoint(double x, double y, double z);
diff --git a/src/bcf-converter/Builder/IMarkupBuilder.cs b/src/bcf-converter/Builder/IMarkupBuilder.cs
index 289d252..416512c 100644
--- a/src/bcf-converter/Builder/IMarkupBuilder.cs
+++ b/src/bcf-converter/Builder/IMarkupBuilder.cs
@@ -1,6 +1,7 @@
 using System;
+using BcfConverter.Model;
 
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public interface IMarkupBuilder<
   out TBuilder,
diff --git a/src/bcf-converter/Builder/IOrthogonalCameraBuilder.cs b/src/bcf-converter/Builder/IOrthogonalCameraBuilder.cs
index 9828b69..590fd89 100644
--- a/src/bcf-converter/Builder/IOrthogonalCameraBuilder.cs
+++ b/src/bcf-converter/Builder/IOrthogonalCameraBuilder.cs
@@ -1,6 +1,7 @@
 using System;
+using BcfConverter.Model;
 
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public interface
   IOrthogonalCameraBuilder<
diff --git a/src/bcf-converter/Builder/IPerspectiveCameraBuilder.cs b/src/bcf-converter/Builder/IPerspectiveCameraBuilder.cs
index e3e3b1e..826fd8b 100644
--- a/src/bcf-converter/Builder/IPerspectiveCameraBuilder.cs
+++ b/src/bcf-converter/Builder/IPerspectiveCameraBuilder.cs
@@ -1,6 +1,7 @@
 using System;
+using BcfConverter.Model;
 
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public interface
   IPerspectiveCameraBuilder<
diff --git a/src/bcf-converter/Builder/IProjectBuilder.cs b/src/bcf-converter/Builder/IProjectBuilder.cs
index 3f29384..5fb0151 100644
--- a/src/bcf-converter/Builder/IProjectBuilder.cs
+++ b/src/bcf-converter/Builder/IProjectBuilder.cs
@@ -1,4 +1,6 @@
-namespace bcf.Builder;
+using BcfConverter.Model;
+
+namespace BcfConverter.Builder;
 
 public interface IProjectBuilder<out TBuilder> : IBuilder<IProject> {
   TBuilder AddProjectName(string name);
diff --git a/src/bcf-converter/Builder/IVersionBuilder.cs b/src/bcf-converter/Builder/IVersionBuilder.cs
index 2dc755c..c1c3cd0 100644
--- a/src/bcf-converter/Builder/IVersionBuilder.cs
+++ b/src/bcf-converter/Builder/IVersionBuilder.cs
@@ -1,4 +1,6 @@
-namespace bcf.Builder;
+using BcfConverter.Model;
+
+namespace BcfConverter.Builder;
 
 public interface IVersionBuilder<out TBuilder> : IBuilder<IVersion> {
   TBuilder AddVersionId(string id);
diff --git a/src/bcf-converter/Builder/IViewPointBuilder.cs b/src/bcf-converter/Builder/IViewPointBuilder.cs
index 90e2b93..55a93ad 100644
--- a/src/bcf-converter/Builder/IViewPointBuilder.cs
+++ b/src/bcf-converter/Builder/IViewPointBuilder.cs
@@ -1,6 +1,7 @@
 using System;
+using BcfConverter.Model;
 
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public interface IViewPointBuilder<
   out TBuilder,
diff --git a/src/bcf-converter/Builder/IViewSetupHintsBuilder.cs b/src/bcf-converter/Builder/IViewSetupHintsBuilder.cs
index 03a9e5e..0e0b1bb 100644
--- a/src/bcf-converter/Builder/IViewSetupHintsBuilder.cs
+++ b/src/bcf-converter/Builder/IViewSetupHintsBuilder.cs
@@ -1,4 +1,6 @@
-namespace bcf.Builder;
+using BcfConverter.Model;
+
+namespace BcfConverter.Builder;
 
 public interface
   IViewSetupHintsBuilder<out TBuilder> : IBuilder<IViewSetupHints> {
diff --git a/src/bcf-converter/Builder/IVisibilityBuilder.cs b/src/bcf-converter/Builder/IVisibilityBuilder.cs
index efbe5ca..5b4a3d4 100644
--- a/src/bcf-converter/Builder/IVisibilityBuilder.cs
+++ b/src/bcf-converter/Builder/IVisibilityBuilder.cs
@@ -1,6 +1,7 @@
 using System;
+using BcfConverter.Model;
 
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public interface
   IVisibilityBuilder<
diff --git a/src/bcf-converter/Builder/MarkupBuilderCreator.cs b/src/bcf-converter/Builder/MarkupBuilderCreator.cs
index 76c8d47..65ff355 100644
--- a/src/bcf-converter/Builder/MarkupBuilderCreator.cs
+++ b/src/bcf-converter/Builder/MarkupBuilderCreator.cs
@@ -1,4 +1,4 @@
-namespace bcf.Builder;
+namespace BcfConverter.Builder;
 
 public static class MarkupBuilderCreator {
   public static Bcf30.MarkupBuilder CreateBuilder() {
diff --git a/src/bcf-converter/Converter/Bcf/BcfConverter.cs b/src/bcf-converter/Converter/Bcf/BcfConverter.cs
index 323a29e..1d9973f 100644
--- a/src/bcf-converter/Converter/Bcf/BcfConverter.cs
+++ b/src/bcf-converter/Converter/Bcf/BcfConverter.cs
@@ -9,8 +9,9 @@
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using System.Xml.Serialization;
+using BcfConverter.Model;
 
-namespace bcf.Converter;
+namespace BcfConverter.Converter;
 
 /// <summary>
 ///   The `BcfConverter` static class unzips and parses BCF zips and
diff --git a/src/bcf-converter/Converter/Bcf/XDocumentExtensions.cs b/src/bcf-converter/Converter/Bcf/XDocumentExtensions.cs
index 7b15c8c..0d733f3 100644
--- a/src/bcf-converter/Converter/Bcf/XDocumentExtensions.cs
+++ b/src/bcf-converter/Converter/Bcf/XDocumentExtensions.cs
@@ -6,7 +6,7 @@
 using System.Xml.Serialization;
 using RecursiveDataAnnotationsValidation;
 
-namespace bcf.Converter;
+namespace BcfConverter.Converter;
 
 /// <summary>
 ///   A list of convenience extension methods on the XDocument class.
diff --git a/src/bcf-converter/Converter/Bcf/ZipArchiveEntryExtensions.cs b/src/bcf-converter/Converter/Bcf/ZipArchiveEntryExtensions.cs
index f6a37a3..51e5d8c 100644
--- a/src/bcf-converter/Converter/Bcf/ZipArchiveEntryExtensions.cs
+++ b/src/bcf-converter/Converter/Bcf/ZipArchiveEntryExtensions.cs
@@ -2,7 +2,7 @@
 using System.IO.Compression;
 using System.Linq;
 
-namespace bcf.Converter;
+namespace BcfConverter.Converter;
 
 public static class ZipArchiveEntryExtensions {
   /// <summary>
diff --git a/src/bcf-converter/Converter/Bcf21/Converter.cs b/src/bcf-converter/Converter/Bcf21/Converter.cs
index 300990a..2aed522 100644
--- a/src/bcf-converter/Converter/Bcf21/Converter.cs
+++ b/src/bcf-converter/Converter/Bcf21/Converter.cs
@@ -1,10 +1,10 @@
 using System.Collections.Concurrent;
 using System.IO;
 using System.Threading.Tasks;
-using bcf.bcf21;
-using bcf.Converter;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf21;
 
-namespace bcf.Converter.Bcf21;
+namespace BcfConverter.Converter.Bcf21;
 
 /// <summary>
 ///   Converter strategy class for converting BCF 2.1 files to JSON
diff --git a/src/bcf-converter/Converter/Bcf30/Converter.cs b/src/bcf-converter/Converter/Bcf30/Converter.cs
index 2be2002..c36b1fe 100644
--- a/src/bcf-converter/Converter/Bcf30/Converter.cs
+++ b/src/bcf-converter/Converter/Bcf30/Converter.cs
@@ -1,8 +1,9 @@
 using System.Collections.Concurrent;
 using System.Threading.Tasks;
-using bcf.bcf30;
+using BcfConverter.Model;
+using BcfConverter.Model.Bcf30;
 
-namespace bcf.Converter.Bcf30;
+namespace BcfConverter.Converter.Bcf30;
 
 /// <summary>
 ///   Converter strategy class for converting BCF 3.0 files to JSON
diff --git a/src/bcf-converter/ConverterContext.cs b/src/bcf-converter/Converter/ConverterContext.cs
similarity index 96%
rename from src/bcf-converter/ConverterContext.cs
rename to src/bcf-converter/Converter/ConverterContext.cs
index 3f38099..62e5342 100644
--- a/src/bcf-converter/ConverterContext.cs
+++ b/src/bcf-converter/Converter/ConverterContext.cs
@@ -3,10 +3,10 @@
 using System;
 using System.Collections.Concurrent;
 using System.Threading.Tasks;
-using bcf.Builder;
-using bcf.Converter;
+using BcfConverter.Builder;
+using BcfConverter.Model;
 
-namespace bcf;
+namespace BcfConverter.Converter;
 
 /// <summary>
 ///   The `ConverterContext` class defines the converter strategy for a specific
diff --git a/src/bcf-converter/Converter/IConverter.cs b/src/bcf-converter/Converter/IConverter.cs
index c2a3c78..008c52a 100644
--- a/src/bcf-converter/Converter/IConverter.cs
+++ b/src/bcf-converter/Converter/IConverter.cs
@@ -1,7 +1,8 @@
 using System.Collections.Concurrent;
 using System.Threading.Tasks;
+using BcfConverter.Model;
 
-namespace bcf.Converter;
+namespace BcfConverter.Converter;
 
 /// <summary>
 ///   Converter strategy interface.
diff --git a/src/bcf-converter/Converter/Json/JsonConverter.cs b/src/bcf-converter/Converter/Json/JsonConverter.cs
index e80f193..142cf98 100644
--- a/src/bcf-converter/Converter/Json/JsonConverter.cs
+++ b/src/bcf-converter/Converter/Json/JsonConverter.cs
@@ -6,11 +6,12 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using BcfConverter.Model;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using RecursiveDataAnnotationsValidation;
 
-namespace bcf.Converter;
+namespace BcfConverter.Converter;
 
 /// <summary>
 ///   The `JsonConverter` static class opens and parses the BCF json files
diff --git a/src/bcf-converter/Model/Bcf21/Markup.cs b/src/bcf-converter/Model/Bcf21/Markup.cs
index 4ba1c99..2bf4d6e 100644
--- a/src/bcf-converter/Model/Bcf21/Markup.cs
+++ b/src/bcf-converter/Model/Bcf21/Markup.cs
@@ -9,7 +9,7 @@
 
 // This code was generated by XmlSchemaClassGenerator version 2.0.517.0.
 
-namespace bcf.bcf21
+namespace BcfConverter.Model.Bcf21
 {
     [System.CodeDom.Compiler.GeneratedCodeAttribute("XmlSchemaClassGenerator", "2.0.517.0")]
     [System.SerializableAttribute()]
diff --git a/src/bcf-converter/Model/Bcf21/MarkupExtensions.cs b/src/bcf-converter/Model/Bcf21/MarkupExtensions.cs
index d951f5d..c97d89c 100644
--- a/src/bcf-converter/Model/Bcf21/MarkupExtensions.cs
+++ b/src/bcf-converter/Model/Bcf21/MarkupExtensions.cs
@@ -2,7 +2,7 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 
-namespace bcf.bcf21;
+namespace BcfConverter.Model.Bcf21;
 
 public partial class Markup : IMarkup {
   public ITopic GetTopic() {
diff --git a/src/bcf-converter/Model/Bcf21/Project.cs b/src/bcf-converter/Model/Bcf21/Project.cs
index 6955996..e3aa20a 100644
--- a/src/bcf-converter/Model/Bcf21/Project.cs
+++ b/src/bcf-converter/Model/Bcf21/Project.cs
@@ -9,7 +9,7 @@
 
 // This code was generated by XmlSchemaClassGenerator version 2.0.878.0 using the following command:
 // xscgen -n bcf.bcf21 project.xsd
-namespace bcf.bcf21
+namespace BcfConverter.Model.Bcf21
 {
     
     
diff --git a/src/bcf-converter/Model/Bcf21/ProjectExtensions.cs b/src/bcf-converter/Model/Bcf21/ProjectExtensions.cs
index 2d0b101..b2edbee 100644
--- a/src/bcf-converter/Model/Bcf21/ProjectExtensions.cs
+++ b/src/bcf-converter/Model/Bcf21/ProjectExtensions.cs
@@ -1,3 +1,3 @@
-namespace bcf.bcf21;
+namespace BcfConverter.Model.Bcf21;
 
 public partial class ProjectExtension : IProject { }
\ No newline at end of file
diff --git a/src/bcf-converter/Model/Bcf21/Root.cs b/src/bcf-converter/Model/Bcf21/Root.cs
index 3d65291..4718fa0 100644
--- a/src/bcf-converter/Model/Bcf21/Root.cs
+++ b/src/bcf-converter/Model/Bcf21/Root.cs
@@ -1,14 +1,13 @@
 using System.Threading.Tasks;
-using bcf.Converter;
 
-namespace bcf.bcf21;
+namespace BcfConverter.Model.Bcf21;
 
 public class Root : IRoot {
   public ProjectExtension? Project { get; set; }
 
   public Task WriteBcf(string folder) {
     return Task.Run(async () => {
-      await BcfConverter.WriteBcfFile(folder, "project.bcfp", Project);
+      await Converter.BcfConverter.WriteBcfFile(folder, "project.bcfp", Project);
     });
   }
 }
\ No newline at end of file
diff --git a/src/bcf-converter/Model/Bcf21/Version.cs b/src/bcf-converter/Model/Bcf21/Version.cs
index 4f5d33d..1165610 100644
--- a/src/bcf-converter/Model/Bcf21/Version.cs
+++ b/src/bcf-converter/Model/Bcf21/Version.cs
@@ -8,7 +8,7 @@
 //------------------------------------------------------------------------------
 
 // This code was generated by XmlSchemaClassGenerator version 2.0.517.0.
-namespace bcf.bcf21 {
+namespace BcfConverter.Model.Bcf21 {
   [System.CodeDom.Compiler.GeneratedCodeAttribute("XmlSchemaClassGenerator", "2.0.517.0")]
   [System.SerializableAttribute()]
   [System.Xml.Serialization.XmlTypeAttribute("Version", Namespace="", AnonymousType=true)]
diff --git a/src/bcf-converter/Model/Bcf21/VersionExtensions.cs b/src/bcf-converter/Model/Bcf21/VersionExtensions.cs
index 6cc29f4..9e4df3e 100644
--- a/src/bcf-converter/Model/Bcf21/VersionExtensions.cs
+++ b/src/bcf-converter/Model/Bcf21/VersionExtensions.cs
@@ -1,4 +1,4 @@
-namespace bcf.bcf21;
+namespace BcfConverter.Model.Bcf21;
 
 public partial class Version : IVersion {
   public Version() {
diff --git a/src/bcf-converter/Model/Bcf21/VisInfoExtensions.cs b/src/bcf-converter/Model/Bcf21/VisInfoExtensions.cs
index b793988..f97f18b 100644
--- a/src/bcf-converter/Model/Bcf21/VisInfoExtensions.cs
+++ b/src/bcf-converter/Model/Bcf21/VisInfoExtensions.cs
@@ -1,4 +1,4 @@
-namespace bcf.bcf21;
+namespace BcfConverter.Model.Bcf21;
 
 public partial class ViewSetupHints : IViewSetupHints { }
 public partial class Component : IComponent { }
diff --git a/src/bcf-converter/Model/Bcf21/VisualizationInformation.cs b/src/bcf-converter/Model/Bcf21/VisualizationInformation.cs
index caf59fe..455690e 100644
--- a/src/bcf-converter/Model/Bcf21/VisualizationInformation.cs
+++ b/src/bcf-converter/Model/Bcf21/VisualizationInformation.cs
@@ -8,7 +8,7 @@
 //------------------------------------------------------------------------------
 
 // This code was generated by XmlSchemaClassGenerator version 2.0.517.0.
-namespace bcf.bcf21
+namespace BcfConverter.Model.Bcf21
 {
     
     
diff --git a/src/bcf-converter/Model/Bcf30/Documents.cs b/src/bcf-converter/Model/Bcf30/Documents.cs
index c91054e..dd6e2e9 100644
--- a/src/bcf-converter/Model/Bcf30/Documents.cs
+++ b/src/bcf-converter/Model/Bcf30/Documents.cs
@@ -9,7 +9,7 @@
 
 // This code was generated by XmlSchemaClassGenerator version 2.0.878.0 using the following command:
 // xscgen -n bcf.bcf30 documents.xsd
-namespace bcf.bcf30
+namespace BcfConverter.Model.Bcf30
 {
     
     
@@ -74,16 +74,16 @@ public partial class DocumentInfo
         
         [System.Xml.Serialization.XmlArrayAttribute("Documents", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
         [System.Xml.Serialization.XmlArrayItemAttribute("Document", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public System.Collections.ObjectModel.Collection<Document> Documents
-        {
-            get
-            {
-                return _documents;
-            }
-            private set
-            {
-                _documents = value;
-            }
+        public System.Collections.ObjectModel.Collection<Document> Documents
+        {
+            get
+            {
+                return _documents;
+            }
+            private set
+            {
+                _documents = value;
+            }
         }
         
         /// <summary>
@@ -119,16 +119,16 @@ public partial class DocumentInfoDocuments
         private System.Collections.ObjectModel.Collection<Document> _document;
         
         [System.Xml.Serialization.XmlElementAttribute("Document", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-        public System.Collections.ObjectModel.Collection<Document> Document
-        {
-            get
-            {
-                return _document;
-            }
-            private set
-            {
-                _document = value;
-            }
+        public System.Collections.ObjectModel.Collection<Document> Document
+        {
+            get
+            {
+                return _document;
+            }
+            private set
+            {
+                _document = value;
+            }
         }
         
         /// <summary>
diff --git a/src/bcf-converter/Model/Bcf30/DocumentsExtensions.cs b/src/bcf-converter/Model/Bcf30/DocumentsExtensions.cs
index 9365447..d344d0a 100644
--- a/src/bcf-converter/Model/Bcf30/DocumentsExtensions.cs
+++ b/src/bcf-converter/Model/Bcf30/DocumentsExtensions.cs
@@ -1,4 +1,4 @@
-namespace bcf.bcf30;
+namespace BcfConverter.Model.Bcf30;
 
 public partial class DocumentInfo : IDocumentInfo { }
 public partial class Document : IDocument { }
\ No newline at end of file
diff --git a/src/bcf-converter/Model/Bcf30/Extensions.cs b/src/bcf-converter/Model/Bcf30/Extensions.cs
index a207862..65d89e5 100644
--- a/src/bcf-converter/Model/Bcf30/Extensions.cs
+++ b/src/bcf-converter/Model/Bcf30/Extensions.cs
@@ -9,7 +9,7 @@
 
 // This code was generated by XmlSchemaClassGenerator version 2.0.878.0 using the following command:
 // xscgen -n bcf.bcf30 extensions.xsd
-namespace bcf.bcf30
+namespace BcfConverter.Model.Bcf30
 {
     
     
diff --git a/src/bcf-converter/Model/Bcf30/ExtensionsExtensions.cs b/src/bcf-converter/Model/Bcf30/ExtensionsExtensions.cs
index bb0350e..c05b405 100644
--- a/src/bcf-converter/Model/Bcf30/ExtensionsExtensions.cs
+++ b/src/bcf-converter/Model/Bcf30/ExtensionsExtensions.cs
@@ -1,3 +1,3 @@
-namespace bcf.bcf30;
+namespace BcfConverter.Model.Bcf30;
 
 public partial class Extensions : IExtensions { }
\ No newline at end of file
diff --git a/src/bcf-converter/Model/Bcf30/Markup.cs b/src/bcf-converter/Model/Bcf30/Markup.cs
index 3a65bff..bb4725d 100644
--- a/src/bcf-converter/Model/Bcf30/Markup.cs
+++ b/src/bcf-converter/Model/Bcf30/Markup.cs
@@ -9,7 +9,7 @@
 
 // This code was generated by XmlSchemaClassGenerator version 2.0.878.0 using the following command:
 // xscgen -n bcf.bcf30 markup.xsd
-namespace bcf.bcf30
+namespace BcfConverter.Model.Bcf30
 {
     
     
diff --git a/src/bcf-converter/Model/Bcf30/MarkupExtensions.cs b/src/bcf-converter/Model/Bcf30/MarkupExtensions.cs
index 98a53b1..5ce73d5 100644
--- a/src/bcf-converter/Model/Bcf30/MarkupExtensions.cs
+++ b/src/bcf-converter/Model/Bcf30/MarkupExtensions.cs
@@ -2,7 +2,7 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 
-namespace bcf.bcf30;
+namespace BcfConverter.Model.Bcf30;
 
 public partial class Markup : IMarkup {
   public ITopic GetTopic() {
diff --git a/src/bcf-converter/Model/Bcf30/Project.cs b/src/bcf-converter/Model/Bcf30/Project.cs
index a948636..d011526 100644
--- a/src/bcf-converter/Model/Bcf30/Project.cs
+++ b/src/bcf-converter/Model/Bcf30/Project.cs
@@ -9,7 +9,7 @@
 
 // This code was generated by XmlSchemaClassGenerator version 2.0.878.0 using the following command:
 // xscgen -n bcf.bcf30 project.xsd
-namespace bcf.bcf30
+namespace BcfConverter.Model.Bcf30
 {
     
     
diff --git a/src/bcf-converter/Model/Bcf30/ProjectExtensions.cs b/src/bcf-converter/Model/Bcf30/ProjectExtensions.cs
index c1dd664..7814592 100644
--- a/src/bcf-converter/Model/Bcf30/ProjectExtensions.cs
+++ b/src/bcf-converter/Model/Bcf30/ProjectExtensions.cs
@@ -1,3 +1,3 @@
-namespace bcf.bcf30;
+namespace BcfConverter.Model.Bcf30;
 
 public partial class ProjectInfo : IProject { }
\ No newline at end of file
diff --git a/src/bcf-converter/Model/Bcf30/Root.cs b/src/bcf-converter/Model/Bcf30/Root.cs
index 8463b98..539a739 100644
--- a/src/bcf-converter/Model/Bcf30/Root.cs
+++ b/src/bcf-converter/Model/Bcf30/Root.cs
@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
-using bcf.Converter;
 
-namespace bcf.bcf30;
+namespace BcfConverter.Model.Bcf30;
 
 public class Root : IRoot {
   public DocumentInfo? Document { get; set; }
@@ -14,11 +13,11 @@ public class Root : IRoot {
   public Task WriteBcf(string folder) {
     return Task.WhenAll(
       Task.Run(() =>
-        BcfConverter.WriteBcfFile(folder, "extensions.xml", Extensions)),
+        Converter.BcfConverter.WriteBcfFile(folder, "extensions.xml", Extensions)),
       Task.Run(() =>
-        BcfConverter.WriteBcfFile(folder, "project.bcfp", Project)),
+        Converter.BcfConverter.WriteBcfFile(folder, "project.bcfp", Project)),
       Task.Run(() =>
-        BcfConverter.WriteBcfFile(folder, "documents.xml", Document))
+        Converter.BcfConverter.WriteBcfFile(folder, "documents.xml", Document))
     );
   }
 }
\ No newline at end of file
diff --git a/src/bcf-converter/Model/Bcf30/Version.cs b/src/bcf-converter/Model/Bcf30/Version.cs
index 1791148..95e77ef 100644
--- a/src/bcf-converter/Model/Bcf30/Version.cs
+++ b/src/bcf-converter/Model/Bcf30/Version.cs
@@ -9,7 +9,7 @@
 
 // This code was generated by XmlSchemaClassGenerator version 2.0.878.0 using the following command:
 // xscgen -n bcf.bcf30 version.xsd
-namespace bcf.bcf30
+namespace BcfConverter.Model.Bcf30
 {
     
     
diff --git a/src/bcf-converter/Model/Bcf30/VersionExtensions.cs b/src/bcf-converter/Model/Bcf30/VersionExtensions.cs
index 9a01fc6..7a4d372 100644
--- a/src/bcf-converter/Model/Bcf30/VersionExtensions.cs
+++ b/src/bcf-converter/Model/Bcf30/VersionExtensions.cs
@@ -1,4 +1,4 @@
-namespace bcf.bcf30;
+namespace BcfConverter.Model.Bcf30;
 
 public partial class Version : IVersion {
   public Version() {
diff --git a/src/bcf-converter/Model/Bcf30/VisInfoExtensions.cs b/src/bcf-converter/Model/Bcf30/VisInfoExtensions.cs
index c4fce5b..8b64c32 100644
--- a/src/bcf-converter/Model/Bcf30/VisInfoExtensions.cs
+++ b/src/bcf-converter/Model/Bcf30/VisInfoExtensions.cs
@@ -1,4 +1,4 @@
-namespace bcf.bcf30;
+namespace BcfConverter.Model.Bcf30;
 
 public partial class ViewSetupHints : IViewSetupHints { }
 public partial class Component : IComponent { }
diff --git a/src/bcf-converter/Model/Bcf30/Visinfo.cs b/src/bcf-converter/Model/Bcf30/Visinfo.cs
index dc185f4..7dee274 100644
--- a/src/bcf-converter/Model/Bcf30/Visinfo.cs
+++ b/src/bcf-converter/Model/Bcf30/Visinfo.cs
@@ -9,7 +9,7 @@
 
 // This code was generated by XmlSchemaClassGenerator version 2.0.878.0 using the following command:
 // xscgen -n bcf.bcf30 visinfo.xsd
-namespace bcf.bcf30
+namespace BcfConverter.Model.Bcf30
 {
     
     
@@ -146,16 +146,16 @@ public partial class Components
         
         [System.Xml.Serialization.XmlArrayAttribute("Selection")]
         [System.Xml.Serialization.XmlArrayItemAttribute("Component")]
-        public System.Collections.ObjectModel.Collection<Component> Selection
-        {
-            get
-            {
-                return _selection;
-            }
-            private set
-            {
-                _selection = value;
-            }
+        public System.Collections.ObjectModel.Collection<Component> Selection
+        {
+            get
+            {
+                return _selection;
+            }
+            private set
+            {
+                _selection = value;
+            }
         }
         
         /// <summary>
@@ -187,16 +187,16 @@ public Components()
         
         [System.Xml.Serialization.XmlArrayAttribute("Coloring")]
         [System.Xml.Serialization.XmlArrayItemAttribute("Color")]
-        public System.Collections.ObjectModel.Collection<ComponentColoringColor> Coloring
-        {
-            get
-            {
-                return _coloring;
-            }
-            private set
-            {
-                _coloring = value;
-            }
+        public System.Collections.ObjectModel.Collection<ComponentColoringColor> Coloring
+        {
+            get
+            {
+                return _coloring;
+            }
+            private set
+            {
+                _coloring = value;
+            }
         }
         
         /// <summary>
@@ -224,16 +224,16 @@ public partial class ComponentSelection
         private System.Collections.ObjectModel.Collection<Component> _component;
         
         [System.Xml.Serialization.XmlElementAttribute("Component")]
-        public System.Collections.ObjectModel.Collection<Component> Component
-        {
-            get
-            {
-                return _component;
-            }
-            private set
-            {
-                _component = value;
-            }
+        public System.Collections.ObjectModel.Collection<Component> Component
+        {
+            get
+            {
+                return _component;
+            }
+            private set
+            {
+                _component = value;
+            }
         }
         
         /// <summary>
@@ -307,16 +307,16 @@ public partial class ComponentVisibility
         
         [System.Xml.Serialization.XmlArrayAttribute("Exceptions")]
         [System.Xml.Serialization.XmlArrayItemAttribute("Component")]
-        public System.Collections.ObjectModel.Collection<Component> Exceptions
-        {
-            get
-            {
-                return _exceptions;
-            }
-            private set
-            {
-                _exceptions = value;
-            }
+        public System.Collections.ObjectModel.Collection<Component> Exceptions
+        {
+            get
+            {
+                return _exceptions;
+            }
+            private set
+            {
+                _exceptions = value;
+            }
         }
         
         /// <summary>
@@ -344,16 +344,16 @@ public ComponentVisibility()
         
         [System.ComponentModel.DefaultValueAttribute(false)]
         [System.Xml.Serialization.XmlAttributeAttribute("DefaultVisibility")]
-        public bool DefaultVisibility
-        {
-            get
-            {
-                return _defaultVisibility;
-            }
-            set
-            {
-                _defaultVisibility = value;
-            }
+        public bool DefaultVisibility
+        {
+            get
+            {
+                return _defaultVisibility;
+            }
+            set
+            {
+                _defaultVisibility = value;
+            }
         }
     }
     
@@ -370,16 +370,16 @@ public partial class ViewSetupHints
         
         [System.ComponentModel.DefaultValueAttribute(false)]
         [System.Xml.Serialization.XmlAttributeAttribute("SpacesVisible")]
-        public bool SpacesVisible
-        {
-            get
-            {
-                return _spacesVisible;
-            }
-            set
-            {
-                _spacesVisible = value;
-            }
+        public bool SpacesVisible
+        {
+            get
+            {
+                return _spacesVisible;
+            }
+            set
+            {
+                _spacesVisible = value;
+            }
         }
         
         [System.Xml.Serialization.XmlIgnoreAttribute()]
@@ -387,16 +387,16 @@ public bool SpacesVisible
         
         [System.ComponentModel.DefaultValueAttribute(false)]
         [System.Xml.Serialization.XmlAttributeAttribute("SpaceBoundariesVisible")]
-        public bool SpaceBoundariesVisible
-        {
-            get
-            {
-                return _spaceBoundariesVisible;
-            }
-            set
-            {
-                _spaceBoundariesVisible = value;
-            }
+        public bool SpaceBoundariesVisible
+        {
+            get
+            {
+                return _spaceBoundariesVisible;
+            }
+            set
+            {
+                _spaceBoundariesVisible = value;
+            }
         }
         
         [System.Xml.Serialization.XmlIgnoreAttribute()]
@@ -404,16 +404,16 @@ public bool SpaceBoundariesVisible
         
         [System.ComponentModel.DefaultValueAttribute(false)]
         [System.Xml.Serialization.XmlAttributeAttribute("OpeningsVisible")]
-        public bool OpeningsVisible
-        {
-            get
-            {
-                return _openingsVisible;
-            }
-            set
-            {
-                _openingsVisible = value;
-            }
+        public bool OpeningsVisible
+        {
+            get
+            {
+                return _openingsVisible;
+            }
+            set
+            {
+                _openingsVisible = value;
+            }
         }
     }
     
@@ -429,16 +429,16 @@ public partial class ComponentVisibilityExceptions
         private System.Collections.ObjectModel.Collection<Component> _component;
         
         [System.Xml.Serialization.XmlElementAttribute("Component")]
-        public System.Collections.ObjectModel.Collection<Component> Component
-        {
-            get
-            {
-                return _component;
-            }
-            private set
-            {
-                _component = value;
-            }
+        public System.Collections.ObjectModel.Collection<Component> Component
+        {
+            get
+            {
+                return _component;
+            }
+            private set
+            {
+                _component = value;
+            }
         }
         
         /// <summary>
@@ -474,16 +474,16 @@ public partial class ComponentColoring
         private System.Collections.ObjectModel.Collection<ComponentColoringColor> _color;
         
         [System.Xml.Serialization.XmlElementAttribute("Color")]
-        public System.Collections.ObjectModel.Collection<ComponentColoringColor> Color
-        {
-            get
-            {
-                return _color;
-            }
-            private set
-            {
-                _color = value;
-            }
+        public System.Collections.ObjectModel.Collection<ComponentColoringColor> Color
+        {
+            get
+            {
+                return _color;
+            }
+            private set
+            {
+                _color = value;
+            }
         }
         
         /// <summary>
@@ -521,16 +521,16 @@ public partial class ComponentColoringColor
         [System.ComponentModel.DataAnnotations.RequiredAttribute()]
         [System.Xml.Serialization.XmlArrayAttribute("Components")]
         [System.Xml.Serialization.XmlArrayItemAttribute("Component")]
-        public System.Collections.ObjectModel.Collection<Component> Components
-        {
-            get
-            {
-                return _components;
-            }
-            private set
-            {
-                _components = value;
-            }
+        public System.Collections.ObjectModel.Collection<Component> Components
+        {
+            get
+            {
+                return _components;
+            }
+            private set
+            {
+                _components = value;
+            }
         }
         
         /// <summary>
@@ -563,16 +563,16 @@ public partial class ComponentColoringColorComponents
         
         [System.ComponentModel.DataAnnotations.RequiredAttribute()]
         [System.Xml.Serialization.XmlElementAttribute("Component")]
-        public System.Collections.ObjectModel.Collection<Component> Component
-        {
-            get
-            {
-                return _component;
-            }
-            private set
-            {
-                _component = value;
-            }
+        public System.Collections.ObjectModel.Collection<Component> Component
+        {
+            get
+            {
+                return _component;
+            }
+            private set
+            {
+                _component = value;
+            }
         }
         
         /// <summary>
@@ -695,16 +695,16 @@ public partial class VisualizationInfo
         
         [System.Xml.Serialization.XmlArrayAttribute("Lines")]
         [System.Xml.Serialization.XmlArrayItemAttribute("Line")]
-        public System.Collections.ObjectModel.Collection<Line> Lines
-        {
-            get
-            {
-                return _lines;
-            }
-            private set
-            {
-                _lines = value;
-            }
+        public System.Collections.ObjectModel.Collection<Line> Lines
+        {
+            get
+            {
+                return _lines;
+            }
+            private set
+            {
+                _lines = value;
+            }
         }
         
         /// <summary>
@@ -734,16 +734,16 @@ public VisualizationInfo()
         
         [System.Xml.Serialization.XmlArrayAttribute("ClippingPlanes")]
         [System.Xml.Serialization.XmlArrayItemAttribute("ClippingPlane")]
-        public System.Collections.ObjectModel.Collection<ClippingPlane> ClippingPlanes
-        {
-            get
-            {
-                return _clippingPlanes;
-            }
-            private set
-            {
-                _clippingPlanes = value;
-            }
+        public System.Collections.ObjectModel.Collection<ClippingPlane> ClippingPlanes
+        {
+            get
+            {
+                return _clippingPlanes;
+            }
+            private set
+            {
+                _clippingPlanes = value;
+            }
         }
         
         /// <summary>
@@ -763,16 +763,16 @@ public bool ClippingPlanesSpecified
         
         [System.Xml.Serialization.XmlArrayAttribute("Bitmaps")]
         [System.Xml.Serialization.XmlArrayItemAttribute("Bitmap")]
-        public System.Collections.ObjectModel.Collection<Bitmap> Bitmaps
-        {
-            get
-            {
-                return _bitmaps;
-            }
-            private set
-            {
-                _bitmaps = value;
-            }
+        public System.Collections.ObjectModel.Collection<Bitmap> Bitmaps
+        {
+            get
+            {
+                return _bitmaps;
+            }
+            private set
+            {
+                _bitmaps = value;
+            }
         }
         
         /// <summary>
@@ -808,16 +808,16 @@ public partial class VisualizationInfoLines
         private System.Collections.ObjectModel.Collection<Line> _line;
         
         [System.Xml.Serialization.XmlElementAttribute("Line")]
-        public System.Collections.ObjectModel.Collection<Line> Line
-        {
-            get
-            {
-                return _line;
-            }
-            private set
-            {
-                _line = value;
-            }
+        public System.Collections.ObjectModel.Collection<Line> Line
+        {
+            get
+            {
+                return _line;
+            }
+            private set
+            {
+                _line = value;
+            }
         }
         
         /// <summary>
@@ -853,16 +853,16 @@ public partial class VisualizationInfoClippingPlanes
         private System.Collections.ObjectModel.Collection<ClippingPlane> _clippingPlane;
         
         [System.Xml.Serialization.XmlElementAttribute("ClippingPlane")]
-        public System.Collections.ObjectModel.Collection<ClippingPlane> ClippingPlane
-        {
-            get
-            {
-                return _clippingPlane;
-            }
-            private set
-            {
-                _clippingPlane = value;
-            }
+        public System.Collections.ObjectModel.Collection<ClippingPlane> ClippingPlane
+        {
+            get
+            {
+                return _clippingPlane;
+            }
+            private set
+            {
+                _clippingPlane = value;
+            }
         }
         
         /// <summary>
@@ -898,16 +898,16 @@ public partial class VisualizationInfoBitmaps
         private System.Collections.ObjectModel.Collection<Bitmap> _bitmap;
         
         [System.Xml.Serialization.XmlElementAttribute("Bitmap")]
-        public System.Collections.ObjectModel.Collection<Bitmap> Bitmap
-        {
-            get
-            {
-                return _bitmap;
-            }
-            private set
-            {
-                _bitmap = value;
-            }
+        public System.Collections.ObjectModel.Collection<Bitmap> Bitmap
+        {
+            get
+            {
+                return _bitmap;
+            }
+            private set
+            {
+                _bitmap = value;
+            }
         }
         
         /// <summary>
diff --git a/src/bcf-converter/Model/BcfVersionEnum.cs b/src/bcf-converter/Model/BcfVersionEnum.cs
index b8d8a0d..9989066 100644
--- a/src/bcf-converter/Model/BcfVersionEnum.cs
+++ b/src/bcf-converter/Model/BcfVersionEnum.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public enum BcfVersionEnum {
   Bcf21,
diff --git a/src/bcf-converter/Model/IBimSnippet.cs b/src/bcf-converter/Model/IBimSnippet.cs
index a3ee613..41d931c 100644
--- a/src/bcf-converter/Model/IBimSnippet.cs
+++ b/src/bcf-converter/Model/IBimSnippet.cs
@@ -1,3 +1,3 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IBimSnippet { }
\ No newline at end of file
diff --git a/src/bcf-converter/Model/IBitmap.cs b/src/bcf-converter/Model/IBitmap.cs
index 8d709fa..715bb79 100644
--- a/src/bcf-converter/Model/IBitmap.cs
+++ b/src/bcf-converter/Model/IBitmap.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IBitmap {
 
diff --git a/src/bcf-converter/Model/IClippingPlane.cs b/src/bcf-converter/Model/IClippingPlane.cs
index a56b90e..359739e 100644
--- a/src/bcf-converter/Model/IClippingPlane.cs
+++ b/src/bcf-converter/Model/IClippingPlane.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IClippingPlane {
 
diff --git a/src/bcf-converter/Model/IColor.cs b/src/bcf-converter/Model/IColor.cs
index 33a1bbc..e71b853 100644
--- a/src/bcf-converter/Model/IColor.cs
+++ b/src/bcf-converter/Model/IColor.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IColor {
 
diff --git a/src/bcf-converter/Model/IComment.cs b/src/bcf-converter/Model/IComment.cs
index 56d37bf..03d44af 100644
--- a/src/bcf-converter/Model/IComment.cs
+++ b/src/bcf-converter/Model/IComment.cs
@@ -1,3 +1,3 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IComment { }
\ No newline at end of file
diff --git a/src/bcf-converter/Model/IComponent.cs b/src/bcf-converter/Model/IComponent.cs
index 27cc928..9a8a2ce 100644
--- a/src/bcf-converter/Model/IComponent.cs
+++ b/src/bcf-converter/Model/IComponent.cs
@@ -1,3 +1,3 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IComponent { }
\ No newline at end of file
diff --git a/src/bcf-converter/Model/IDocumentInfo.cs b/src/bcf-converter/Model/IDocumentInfo.cs
index 528bd7f..2a4e440 100644
--- a/src/bcf-converter/Model/IDocumentInfo.cs
+++ b/src/bcf-converter/Model/IDocumentInfo.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IDocumentInfo {
 
diff --git a/src/bcf-converter/Model/IDocumentReference.cs b/src/bcf-converter/Model/IDocumentReference.cs
index 88224d7..be06bb4 100644
--- a/src/bcf-converter/Model/IDocumentReference.cs
+++ b/src/bcf-converter/Model/IDocumentReference.cs
@@ -1,3 +1,3 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IDocReference { }
\ No newline at end of file
diff --git a/src/bcf-converter/Model/IDocuments.cs b/src/bcf-converter/Model/IDocuments.cs
index 6feed30..7a86e70 100644
--- a/src/bcf-converter/Model/IDocuments.cs
+++ b/src/bcf-converter/Model/IDocuments.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public class IDocument {
 
diff --git a/src/bcf-converter/Model/IExtensions.cs b/src/bcf-converter/Model/IExtensions.cs
index ee001e0..4f3ae6e 100644
--- a/src/bcf-converter/Model/IExtensions.cs
+++ b/src/bcf-converter/Model/IExtensions.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IExtensions {
 
diff --git a/src/bcf-converter/Model/IHeader.cs b/src/bcf-converter/Model/IHeader.cs
index cc719eb..d2468d4 100644
--- a/src/bcf-converter/Model/IHeader.cs
+++ b/src/bcf-converter/Model/IHeader.cs
@@ -1,3 +1,3 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IHeaderFile { }
\ No newline at end of file
diff --git a/src/bcf-converter/Model/ILine.cs b/src/bcf-converter/Model/ILine.cs
index 1a73eea..d86ac90 100644
--- a/src/bcf-converter/Model/ILine.cs
+++ b/src/bcf-converter/Model/ILine.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface ILine {
 
diff --git a/src/bcf-converter/Model/IMarkup.cs b/src/bcf-converter/Model/IMarkup.cs
index 5ca8726..a223a50 100644
--- a/src/bcf-converter/Model/IMarkup.cs
+++ b/src/bcf-converter/Model/IMarkup.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IMarkup {
   public ITopic? GetTopic();
diff --git a/src/bcf-converter/Model/IOrthogonalCamera.cs b/src/bcf-converter/Model/IOrthogonalCamera.cs
index 5f00f9c..bcda2ae 100644
--- a/src/bcf-converter/Model/IOrthogonalCamera.cs
+++ b/src/bcf-converter/Model/IOrthogonalCamera.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IOrthogonalCamera {
 
diff --git a/src/bcf-converter/Model/IPerspectiveCamera.cs b/src/bcf-converter/Model/IPerspectiveCamera.cs
index dff2928..94c1754 100644
--- a/src/bcf-converter/Model/IPerspectiveCamera.cs
+++ b/src/bcf-converter/Model/IPerspectiveCamera.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IPerspectiveCamera {
 
diff --git a/src/bcf-converter/Model/IProject.cs b/src/bcf-converter/Model/IProject.cs
index f7d36e9..ae7dfd8 100644
--- a/src/bcf-converter/Model/IProject.cs
+++ b/src/bcf-converter/Model/IProject.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public class IProject {
 
diff --git a/src/bcf-converter/Model/IRoot.cs b/src/bcf-converter/Model/IRoot.cs
index d686ead..943e56d 100644
--- a/src/bcf-converter/Model/IRoot.cs
+++ b/src/bcf-converter/Model/IRoot.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IRoot {
   public Task WriteBcf(string folder);
diff --git a/src/bcf-converter/Model/ITopic.cs b/src/bcf-converter/Model/ITopic.cs
index 2ca4ab5..8493f20 100644
--- a/src/bcf-converter/Model/ITopic.cs
+++ b/src/bcf-converter/Model/ITopic.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface ITopic {
   public string Guid { get; set; }
diff --git a/src/bcf-converter/Model/IVersion.cs b/src/bcf-converter/Model/IVersion.cs
index 842c0a6..48fe87a 100644
--- a/src/bcf-converter/Model/IVersion.cs
+++ b/src/bcf-converter/Model/IVersion.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IVersion {
 
diff --git a/src/bcf-converter/Model/IViewPoint.cs b/src/bcf-converter/Model/IViewPoint.cs
index f591b01..d7f244a 100644
--- a/src/bcf-converter/Model/IViewPoint.cs
+++ b/src/bcf-converter/Model/IViewPoint.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IViewPoint {
   public string? SnapshotData { get; set; }
diff --git a/src/bcf-converter/Model/IViewSetupHints.cs b/src/bcf-converter/Model/IViewSetupHints.cs
index 7fb7d95..da92d30 100644
--- a/src/bcf-converter/Model/IViewSetupHints.cs
+++ b/src/bcf-converter/Model/IViewSetupHints.cs
@@ -1,3 +1,3 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IViewSetupHints { }
\ No newline at end of file
diff --git a/src/bcf-converter/Model/IVisibility.cs b/src/bcf-converter/Model/IVisibility.cs
index b307a1f..071cbe3 100644
--- a/src/bcf-converter/Model/IVisibility.cs
+++ b/src/bcf-converter/Model/IVisibility.cs
@@ -1,4 +1,4 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IVisibility {
 
diff --git a/src/bcf-converter/Model/IVisualizationInfo.cs b/src/bcf-converter/Model/IVisualizationInfo.cs
index 756c927..9052462 100644
--- a/src/bcf-converter/Model/IVisualizationInfo.cs
+++ b/src/bcf-converter/Model/IVisualizationInfo.cs
@@ -1,3 +1,3 @@
-namespace bcf;
+namespace BcfConverter.Model;
 
 public interface IVisualizationInfo { }
\ No newline at end of file
diff --git a/src/bcf-converter/Program.cs b/src/bcf-converter/Program.cs
index 828c04e..74c63d1 100644
--- a/src/bcf-converter/Program.cs
+++ b/src/bcf-converter/Program.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Threading.Tasks;
-using bcf.Builder;
+using BcfConverter.Converter;
+using BcfConverter.Model;
 
-namespace bcf;
+namespace BcfConverter;
 
 internal static class Program {
   private static async Task Main(string[] args) {