diff --git a/Models/BrAddressModel.cs b/BrAddressModel.cs
similarity index 98%
rename from Models/BrAddressModel.cs
rename to BrAddressModel.cs
index 44093d4..f1d591d 100644
--- a/Models/BrAddressModel.cs
+++ b/BrAddressModel.cs
@@ -26,7 +26,7 @@
 
 using System.Collections.Generic;
 
-namespace FCS.Lib.BrReg.Models;
+namespace FCS.Lib.BrReg;
 
 public class BrAddressModel
 {
diff --git a/Models/BrCompanyModel.cs b/BrCompanyModel.cs
similarity index 87%
rename from Models/BrCompanyModel.cs
rename to BrCompanyModel.cs
index 65a244a..f64d730 100644
--- a/Models/BrCompanyModel.cs
+++ b/BrCompanyModel.cs
@@ -24,7 +24,7 @@
 // <summary></summary>
 // ***********************************************************************
 
-namespace FCS.Lib.BrReg.Models
+namespace FCS.Lib.BrReg
 {
     public class BrCompanyModel
     {
@@ -34,9 +34,9 @@ namespace FCS.Lib.BrReg.Models
         public BrCompanyTypeModel Organisasjonsform { get; set; } = new();
         public BrAddressModel Postadresse { get; set; } = new();
         public BrAddressModel Forretningsadresse { get; set; } = new();
-        public string Konkurs { get; set; } = "false";
-        public string UnderAvvikling { get; set; } = "false";
-        public string UnderTvangsavviklingEllerTvangsopplosning { get; set; } = "false";
+        public bool Konkurs { get; set; }
+        public bool UnderAvvikling { get; set; }
+        public bool UnderTvangsavviklingEllerTvangsopplosning { get; set; }
 
     }
 }
diff --git a/Models/BrCompanyTypeModel.cs b/BrCompanyTypeModel.cs
similarity index 97%
rename from Models/BrCompanyTypeModel.cs
rename to BrCompanyTypeModel.cs
index ab07bfc..81dcb6f 100644
--- a/Models/BrCompanyTypeModel.cs
+++ b/BrCompanyTypeModel.cs
@@ -23,7 +23,7 @@
 // </copyright>
 // <summary></summary>
 // ***********************************************************************
-namespace FCS.Lib.BrReg.Models;
+namespace FCS.Lib.BrReg;
 
 public class BrCompanyTypeModel
 {
diff --git a/BrRegQuery.cs b/BrRegQuery.cs
new file mode 100644
index 0000000..6cd96ab
--- /dev/null
+++ b/BrRegQuery.cs
@@ -0,0 +1,7 @@
+namespace FCS.Lib.BrReg;
+
+public class BrRegQuery
+{
+    public string VatNumber { get; set; }
+
+}
\ No newline at end of file
diff --git a/BrResponseParser.cs b/BrResponseParser.cs
index 60f7ea4..27fd89b 100644
--- a/BrResponseParser.cs
+++ b/BrResponseParser.cs
@@ -24,7 +24,6 @@
 // <summary></summary>
 // ***********************************************************************
 
-using FCS.Lib.BrReg.Models;
 using Newtonsoft.Json;
 
 namespace FCS.Lib.BrReg
diff --git a/BrVatInfoMapper.cs b/BrVatInfoMapper.cs
index 2f08a4b..51bb9d7 100644
--- a/BrVatInfoMapper.cs
+++ b/BrVatInfoMapper.cs
@@ -25,14 +25,51 @@
 // ***********************************************************************
 
 using System;
-using FCS.Lib.BrReg.Models;
+using System.Collections.Generic;
 using FCS.Lib.Common;
 
 namespace FCS.Lib.BrReg
 {
     public class BrVatInfoMapper
     {
-        public VatStateInfo MapBrToCrm(BrCompanyModel brCompany)
+
+        public VatInfoDto MapBrToCrm(BrCompanyModel brCompany)
+        {
+            return new VatInfoDto
+            {
+                Name = brCompany.Navn,
+                Address = string.Join(", ", brCompany.Forretningsadresse.Adresse),
+                City = brCompany.Forretningsadresse.Poststed,
+                RequestDate = $"{DateTime.Now:yyyy-MM-dd}",
+                ZipCode = brCompany.Forretningsadresse.Postnummer,
+                VatNumber = brCompany.Organisasjonsnummer,
+                States = new List<VatState>
+                {
+                    new()
+                    {
+                        LastUpdate = "",
+                        State = MapBrVatState(brCompany).HasFolded ? "LUKKET" : "NORMAL",
+                        TimeFrame = new TimeFrame
+                        {
+                            StartDate = "",
+                            EndDate = ""
+                        }
+                    }
+                },
+                LifeCycles = new List<LifeCycle>
+                {
+                    new()
+                    {
+                        TimeFrame = new TimeFrame
+                        {
+                            EndDate = "NN",
+                            StartDate = "NN"
+                        }
+                    }
+                }
+            };
+        }
+        public VatStateInfo MapBrVatState(BrCompanyModel brCompany)
         {
             if (brCompany == null)
             {
@@ -50,13 +87,7 @@ namespace FCS.Lib.BrReg
                 VatNumberValid = true
             };
 
-            if (brCompany.Konkurs == "true")
-                c.HasFolded = true;
-
-            if (brCompany.UnderAvvikling == "true")
-                c.HasFolded = true;
-
-            if (brCompany.UnderTvangsavviklingEllerTvangsopplosning == "true")
+            if (brCompany.Konkurs || brCompany.UnderAvvikling || brCompany.UnderTvangsavviklingEllerTvangsopplosning)
                 c.HasFolded = true;
 
             if(!string.IsNullOrWhiteSpace(brCompany.Organisasjonsform.Utgaatt))
diff --git a/FCS.Lib.BrReg.csproj b/FCS.Lib.BrReg.csproj
index d238f7d..3c5db7e 100644
--- a/FCS.Lib.BrReg.csproj
+++ b/FCS.Lib.BrReg.csproj
@@ -47,9 +47,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Models\BrAddressModel.cs" />
-    <Compile Include="Models\BrCompanyModel.cs" />
-    <Compile Include="Models\BrCompanyTypeModel.cs" />
+    <Compile Include="BrAddressModel.cs" />
+    <Compile Include="BrCompanyModel.cs" />
+    <Compile Include="BrCompanyTypeModel.cs" />
+    <Compile Include="BrRegQuery.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="BrHttpRequest.cs" />
     <Compile Include="BrResponseView.cs" />
@@ -70,5 +71,6 @@
   <ItemGroup>
     <Content Include=".gitignore" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/FCS.Lib.BrReg.csproj.user b/FCS.Lib.BrReg.csproj.user
new file mode 100644
index 0000000..9b86104
--- /dev/null
+++ b/FCS.Lib.BrReg.csproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ShowAllFiles</ProjectView>
+  </PropertyGroup>
+</Project>
\ No newline at end of file