diff --git a/SalesCatalog/SalesCatalog.csproj b/SalesCatalog/SalesCatalog.csproj
index 96872501..5aea0e3a 100644
--- a/SalesCatalog/SalesCatalog.csproj
+++ b/SalesCatalog/SalesCatalog.csproj
@@ -9,6 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>SalesCatalog</RootNamespace>
     <AssemblyName>SalesCatalog</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,44 +39,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Configuration\CatalogProviderConfigurationElement.cs" />
-    <Compile Include="Configuration\CatalogProvidersConfigurationSection.cs" />
-    <Compile Include="Configuration\CatalogProvidersConfigurationCollection.cs" />
-    <Compile Include="CatalogManager.cs" />
-    <Compile Include="Model\CheckBox.cs" />
-    <Compile Include="Model\Currency.cs" />
-    <Compile Include="Model\Euro.cs" />
-    <Compile Include="Model\FilesInput.cs" />
-    <Compile Include="Model\FormElement.cs" />
-    <Compile Include="Model\FormInput.cs" />
-    <Compile Include="Model\Label.cs" />
-    <Compile Include="Model\Link.cs" />
-    <Compile Include="Model\Price.cs" />
-    <Compile Include="Model\ProductCategory.cs" />
-    <Compile Include="Model\RadioButton.cs" />
-    <Compile Include="Model\SelectInput.cs" />
-    <Compile Include="Model\TextInput.cs" />
-    <Compile Include="Model\Unit.cs" />
-    <Compile Include="Model\Brand.cs" />
-    <Compile Include="CatalogProvider.cs" />
     <Compile Include="XmlImplementation\XmlCatalog.cs" />
-    <Compile Include="CatalogHelper.cs" />
     <Compile Include="Tests\TestCatalogInit.cs" />
-    <Compile Include="Model\Product.cs" />
-    <Compile Include="Model\Period.cs" />
-    <Compile Include="Model\Service.cs" />
-    <Compile Include="Model\PhysicalProduct.cs" />
-    <Compile Include="Model\Catalog.cs" />
     <Compile Include="XmlImplementation\XmlCatalogProvider.cs" />
-    <Compile Include="Model\Text.cs" />
-    <Compile Include="Model\SelectItem.cs" />
-    <Compile Include="Model\StockStatus.cs" />
-    <Compile Include="Model\Scalar.cs" />
     <Compile Include="Tests\TestBrands.cs" />
-    <Compile Include="Model\SaleForm.cs" />
-    <Compile Include="Model\ProductImage.cs" />
-    <Compile Include="Model\Option.cs" />
-    <Compile Include="Model\Note.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
@@ -95,4 +62,10 @@
     <Folder Include="XmlImplementation\" />
     <Folder Include="Tests\" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\yavscModel\YavscModel.csproj">
+      <Project>{68F5B80A-616E-4C3C-91A0-828AA40000BD}</Project>
+      <Name>YavscModel</Name>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/SalesCatalog/XmlImplementation/XmlCatalog.cs b/SalesCatalog/XmlImplementation/XmlCatalog.cs
index 31b2a2ba..745af5e9 100644
--- a/SalesCatalog/XmlImplementation/XmlCatalog.cs
+++ b/SalesCatalog/XmlImplementation/XmlCatalog.cs
@@ -1,6 +1,6 @@
 using System;
-using SalesCatalog.Model;
 using System.Xml.Serialization;
+using Yavsc.Model.FrontOffice;
 
 namespace SalesCatalog.XmlImplementation
 {
diff --git a/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs b/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs
index 95b18e5d..d05d9830 100644
--- a/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs
+++ b/SalesCatalog/XmlImplementation/XmlCatalogProvider.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Xml.Serialization;
-using SalesCatalog.Model;
 using System.Configuration;
 using System.IO;
 using System.Xml;
+using Yavsc.Model.FrontOffice;
 
 namespace SalesCatalog.XmlImplementation
 {
diff --git a/web/CatExts/WebCatalogExtensions.cs b/web/CatExts/WebCatalogExtensions.cs
index b7679832..e811e836 100644
--- a/web/CatExts/WebCatalogExtensions.cs
+++ b/web/CatExts/WebCatalogExtensions.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Web;
-using SalesCatalog;
-using SalesCatalog.Model;
 using System.Text;
 using System.Web.Mvc;
 using System.Web.Routing;
 using System.Web.Mvc.Html;
+using Yavsc.Model.FrontOffice;
 
 namespace Yavsc.CatExts
 {
diff --git a/web/Catalog.xml b/web/Catalog.xml
index d0aa9399..34ccc98d 100644
--- a/web/Catalog.xml
+++ b/web/Catalog.xml
@@ -38,17 +38,26 @@
         <Id>comment</Id>
         <Value xsi:type="xsd:string">Commentaire</Value>
       </FormElement>
-      <!-- <FormElement xsi:type="Text">
+      <FormElement xsi:type="Text">
         <Val>Choisissez le type d'intervention souhaité: </Val>
       </FormElement>
-     - <FormElement xsi:type="SelectInput">
+
+      <FormElement xsi:type="TextInput">
+        <Id>testarray[]</Id>
+        <Value xsi:type="xsd:string">xxxxxxxxxx</Value>
+      </FormElement>
+      <FormElement xsi:type="TextInput">
+        <Id>testarray[]</Id>
+        <Value xsi:type="xsd:string"></Value>
+      </FormElement>
+      <FormElement xsi:type="SelectInput">
         <Id>ad</Id>
         <Items>
           <string>à distance</string>
           <string>sur site</string>
         </Items>
         <SelectedIndex>0</SelectedIndex>
-      </FormElement> -->
+      </FormElement>
     </Items>
   </DefaultForm>
     </Brand>
diff --git a/web/Controllers/FrontOfficeApiController.cs b/web/Controllers/FrontOfficeApiController.cs
index d94f0744..49dc0e00 100644
--- a/web/Controllers/FrontOfficeApiController.cs
+++ b/web/Controllers/FrontOfficeApiController.cs
@@ -1,7 +1,6 @@
 using System;
 using Yavsc;
 using SalesCatalog;
-using SalesCatalog.Model;
 using System.Web.Routing;
 using System.Threading.Tasks;
 using System.Diagnostics;
@@ -23,6 +22,7 @@ using System.Text;
 using System.Web.Profile;
 using System.Collections.Specialized;
 using Yavsc.Model;
+using Yavsc.Model.FrontOffice;
 
 namespace Yavsc.ApiControllers
 {
diff --git a/web/Controllers/FrontOfficeController.cs b/web/Controllers/FrontOfficeController.cs
index 83ed31d6..81cb5b8b 100644
--- a/web/Controllers/FrontOfficeController.cs
+++ b/web/Controllers/FrontOfficeController.cs
@@ -1,7 +1,5 @@
 using System;
 using Yavsc;
-using SalesCatalog;
-using SalesCatalog.Model;
 using System.Web.Mvc;
 using System.Web;
 using System.Text.RegularExpressions;
diff --git a/web/Controllers/IValueProvider.cs b/web/Controllers/IValueProvider.cs
index 2a408b9a..accea934 100644
--- a/web/Controllers/IValueProvider.cs
+++ b/web/Controllers/IValueProvider.cs
@@ -1,7 +1,6 @@
 using System;
 using Yavsc;
 using SalesCatalog;
-using SalesCatalog.Model;
 using System.Web.Routing;
 using System.Threading.Tasks;
 using System.Diagnostics;
diff --git a/web/Controllers/TemplateException.cs b/web/Controllers/TemplateException.cs
index 19c49980..2d6b530d 100644
--- a/web/Controllers/TemplateException.cs
+++ b/web/Controllers/TemplateException.cs
@@ -1,7 +1,6 @@
 using System;
 using Yavsc;
 using SalesCatalog;
-using SalesCatalog.Model;
 using System.Web.Routing;
 using System.Threading.Tasks;
 using System.Diagnostics;
diff --git a/web/Web.config b/web/Web.config
index 11f0edcd..be41dd8f 100644
--- a/web/Web.config
+++ b/web/Web.config
@@ -240,7 +240,7 @@ http://msdn2.microsoft.com/en-us/library/b5ysx397.aspx
   </system.diagnostics>
   <catalog defaultProvider="XmlCatalogProvider">
     <providers>
-      <add name="XmlCatalogProvider" connection="/srv/www/yavsc/Catalog.xml" applicationName="/" type="SalesCatalog.XmlImplementation.XmlCatalogProvider, SalesCatalog" />
+      <add name="XmlCatalogProvider" connection="~/Catalog.xml" applicationName="/" type="SalesCatalog.XmlImplementation.XmlCatalogProvider, SalesCatalog" />
     </providers>
   </catalog>
   <system.net>
diff --git a/SalesCatalog/Model/Brand.cs b/yavscModel/FrontOffice/Catalog/Brand.cs
similarity index 92%
rename from SalesCatalog/Model/Brand.cs
rename to yavscModel/FrontOffice/Catalog/Brand.cs
index 0c948542..470a7bcf 100644
--- a/SalesCatalog/Model/Brand.cs
+++ b/yavscModel/FrontOffice/Catalog/Brand.cs
@@ -1,8 +1,7 @@
 using System;
-using System.Xml.Serialization;
 using System.ComponentModel.DataAnnotations;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class Brand
 	{
diff --git a/SalesCatalog/Model/Catalog.cs b/yavscModel/FrontOffice/Catalog/Catalog.cs
similarity index 97%
rename from SalesCatalog/Model/Catalog.cs
rename to yavscModel/FrontOffice/Catalog/Catalog.cs
index 2fb41aaa..e5508754 100644
--- a/SalesCatalog/Model/Catalog.cs
+++ b/yavscModel/FrontOffice/Catalog/Catalog.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	/// <summary>
 	/// Catalog.
diff --git a/SalesCatalog/CatalogHelper.cs b/yavscModel/FrontOffice/Catalog/CatalogHelper.cs
similarity index 96%
rename from SalesCatalog/CatalogHelper.cs
rename to yavscModel/FrontOffice/Catalog/CatalogHelper.cs
index e6b493f5..33ac9949 100644
--- a/SalesCatalog/CatalogHelper.cs
+++ b/yavscModel/FrontOffice/Catalog/CatalogHelper.cs
@@ -2,9 +2,9 @@ using System;
 using System.Configuration;
 using System.Reflection;
 using System.Collections.Specialized;
-using SalesCatalog.Configuration;
+using Yavsc.Model.FrontOffice.Configuration;
 
-namespace SalesCatalog
+namespace Yavsc.Model.FrontOffice
 {
 	/// <summary>
 	/// Catalog helper.
diff --git a/SalesCatalog/CatalogManager.cs b/yavscModel/FrontOffice/Catalog/CatalogManager.cs
similarity index 94%
rename from SalesCatalog/CatalogManager.cs
rename to yavscModel/FrontOffice/Catalog/CatalogManager.cs
index c9552a86..2d1628fa 100644
--- a/SalesCatalog/CatalogManager.cs
+++ b/yavscModel/FrontOffice/Catalog/CatalogManager.cs
@@ -1,7 +1,5 @@
 using System;
-using SalesCatalog.Model;
-
-namespace SalesCatalog
+namespace Yavsc.Model.FrontOffice
 {
 	/// <summary>
 	/// Catalog manager.
diff --git a/SalesCatalog/CatalogProvider.cs b/yavscModel/FrontOffice/Catalog/CatalogProvider.cs
similarity index 85%
rename from SalesCatalog/CatalogProvider.cs
rename to yavscModel/FrontOffice/Catalog/CatalogProvider.cs
index c7fa1e32..c922008e 100644
--- a/SalesCatalog/CatalogProvider.cs
+++ b/yavscModel/FrontOffice/Catalog/CatalogProvider.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Configuration.Provider;
-using SalesCatalog.Model;
 
-namespace SalesCatalog
+namespace Yavsc.Model.FrontOffice
 {
 	/// <summary>
 	/// Catalog provider.<br/>
diff --git a/SalesCatalog/Model/CheckBox.cs b/yavscModel/FrontOffice/Catalog/CheckBox.cs
similarity index 92%
rename from SalesCatalog/Model/CheckBox.cs
rename to yavscModel/FrontOffice/Catalog/CheckBox.cs
index 91321fc7..41ac08ef 100644
--- a/SalesCatalog/Model/CheckBox.cs
+++ b/yavscModel/FrontOffice/Catalog/CheckBox.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class CheckBox : FormInput
 	{
diff --git a/SalesCatalog/Configuration/CatalogProviderConfigurationElement.cs b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProviderConfigurationElement.cs
similarity index 95%
rename from SalesCatalog/Configuration/CatalogProviderConfigurationElement.cs
rename to yavscModel/FrontOffice/Catalog/Configuration/CatalogProviderConfigurationElement.cs
index 60488a35..9538635f 100644
--- a/SalesCatalog/Configuration/CatalogProviderConfigurationElement.cs
+++ b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProviderConfigurationElement.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Configuration;
 
-namespace SalesCatalog.Configuration
+namespace Yavsc.Model.FrontOffice.Configuration
 {
 
 	public class CatalogProviderConfigurationElement : ConfigurationElement
diff --git a/SalesCatalog/Configuration/CatalogProvidersConfigurationCollection.cs b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationCollection.cs
similarity index 92%
rename from SalesCatalog/Configuration/CatalogProvidersConfigurationCollection.cs
rename to yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationCollection.cs
index cf1491a2..0f1e181f 100644
--- a/SalesCatalog/Configuration/CatalogProvidersConfigurationCollection.cs
+++ b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationCollection.cs
@@ -2,7 +2,7 @@ using System;
 using System.Configuration;
 using System.ComponentModel;
 
-namespace SalesCatalog.Configuration
+namespace Yavsc.Model.FrontOffice.Configuration
 {
 	public class CatalogProvidersConfigurationCollection : ConfigurationElementCollection
 	{
diff --git a/SalesCatalog/Configuration/CatalogProvidersConfigurationSection.cs b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs
similarity index 93%
rename from SalesCatalog/Configuration/CatalogProvidersConfigurationSection.cs
rename to yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs
index b6f945c9..b404992d 100644
--- a/SalesCatalog/Configuration/CatalogProvidersConfigurationSection.cs
+++ b/yavscModel/FrontOffice/Catalog/Configuration/CatalogProvidersConfigurationSection.cs
@@ -2,7 +2,7 @@ using System;
 using System.Configuration;
 using System.ComponentModel;
 
-namespace SalesCatalog.Configuration
+namespace Yavsc.Model.FrontOffice.Configuration
 {
 	public class CatalogProvidersConfigurationSection : ConfigurationSection
 	{
diff --git a/SalesCatalog/Model/Currency.cs b/yavscModel/FrontOffice/Catalog/Currency.cs
similarity index 65%
rename from SalesCatalog/Model/Currency.cs
rename to yavscModel/FrontOffice/Catalog/Currency.cs
index 0700448c..b2dd1696 100644
--- a/SalesCatalog/Model/Currency.cs
+++ b/yavscModel/FrontOffice/Catalog/Currency.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public abstract class Currency: Unit
 	{
diff --git a/SalesCatalog/Model/Euro.cs b/yavscModel/FrontOffice/Catalog/Euro.cs
similarity index 93%
rename from SalesCatalog/Model/Euro.cs
rename to yavscModel/FrontOffice/Catalog/Euro.cs
index 72e3f576..2eee2f44 100644
--- a/SalesCatalog/Model/Euro.cs
+++ b/yavscModel/FrontOffice/Catalog/Euro.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class Euro : Currency
 	{
diff --git a/SalesCatalog/Model/FilesInput.cs b/yavscModel/FrontOffice/Catalog/FilesInput.cs
similarity index 91%
rename from SalesCatalog/Model/FilesInput.cs
rename to yavscModel/FrontOffice/Catalog/FilesInput.cs
index 06ab9ebb..b6a76eaf 100644
--- a/SalesCatalog/Model/FilesInput.cs
+++ b/yavscModel/FrontOffice/Catalog/FilesInput.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class FilesInput : FormInput
 	{
diff --git a/SalesCatalog/Model/FormElement.cs b/yavscModel/FrontOffice/Catalog/FormElement.cs
similarity index 74%
rename from SalesCatalog/Model/FormElement.cs
rename to yavscModel/FrontOffice/Catalog/FormElement.cs
index 283c0312..c2367b95 100644
--- a/SalesCatalog/Model/FormElement.cs
+++ b/yavscModel/FrontOffice/Catalog/FormElement.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public abstract class FormElement
 	{
diff --git a/SalesCatalog/Model/FormInput.cs b/yavscModel/FrontOffice/Catalog/FormInput.cs
similarity index 93%
rename from SalesCatalog/Model/FormInput.cs
rename to yavscModel/FrontOffice/Catalog/FormInput.cs
index c291f2f4..f8b22d54 100644
--- a/SalesCatalog/Model/FormInput.cs
+++ b/yavscModel/FrontOffice/Catalog/FormInput.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public abstract class FormInput: FormElement
 	{
diff --git a/SalesCatalog/Model/Label.cs b/yavscModel/FrontOffice/Catalog/Label.cs
similarity index 88%
rename from SalesCatalog/Model/Label.cs
rename to yavscModel/FrontOffice/Catalog/Label.cs
index 6b3c9803..635ff4a0 100644
--- a/SalesCatalog/Model/Label.cs
+++ b/yavscModel/FrontOffice/Catalog/Label.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class Label:FormElement
 	{
diff --git a/SalesCatalog/Model/Link.cs b/yavscModel/FrontOffice/Catalog/Link.cs
similarity index 83%
rename from SalesCatalog/Model/Link.cs
rename to yavscModel/FrontOffice/Catalog/Link.cs
index 728c824c..41d7d32f 100644
--- a/SalesCatalog/Model/Link.cs
+++ b/yavscModel/FrontOffice/Catalog/Link.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class Link:Label
 	{
diff --git a/SalesCatalog/Model/Note.cs b/yavscModel/FrontOffice/Catalog/Note.cs
similarity index 80%
rename from SalesCatalog/Model/Note.cs
rename to yavscModel/FrontOffice/Catalog/Note.cs
index add594c4..5c3ec6b1 100644
--- a/SalesCatalog/Model/Note.cs
+++ b/yavscModel/FrontOffice/Catalog/Note.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class Note:Text
 	{
diff --git a/SalesCatalog/Model/Option.cs b/yavscModel/FrontOffice/Catalog/Option.cs
similarity index 89%
rename from SalesCatalog/Model/Option.cs
rename to yavscModel/FrontOffice/Catalog/Option.cs
index daeea5a3..3c03c798 100644
--- a/SalesCatalog/Model/Option.cs
+++ b/yavscModel/FrontOffice/Catalog/Option.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class Option : FormElement
 	{
diff --git a/SalesCatalog/Model/Period.cs b/yavscModel/FrontOffice/Catalog/Period.cs
similarity index 82%
rename from SalesCatalog/Model/Period.cs
rename to yavscModel/FrontOffice/Catalog/Period.cs
index b4e30b31..6e063d2c 100644
--- a/SalesCatalog/Model/Period.cs
+++ b/yavscModel/FrontOffice/Catalog/Period.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class Period
 	{
diff --git a/SalesCatalog/Model/PhysicalProduct.cs b/yavscModel/FrontOffice/Catalog/PhysicalProduct.cs
similarity index 94%
rename from SalesCatalog/Model/PhysicalProduct.cs
rename to yavscModel/FrontOffice/Catalog/PhysicalProduct.cs
index 158c0d5d..f3060e0a 100644
--- a/SalesCatalog/Model/PhysicalProduct.cs
+++ b/yavscModel/FrontOffice/Catalog/PhysicalProduct.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class PhysicalProduct : Product
 	{
diff --git a/SalesCatalog/Model/Price.cs b/yavscModel/FrontOffice/Catalog/Price.cs
similarity index 83%
rename from SalesCatalog/Model/Price.cs
rename to yavscModel/FrontOffice/Catalog/Price.cs
index dee40da1..b468b56c 100644
--- a/SalesCatalog/Model/Price.cs
+++ b/yavscModel/FrontOffice/Catalog/Price.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class Price: Scalar
 	{
@@ -21,7 +21,7 @@ namespace SalesCatalog.Model
 		}
 
 		Currency curr;
-		public override SalesCatalog.Model.Unit Unit {
+		public override Unit Unit {
 			get {
 				return curr;
 			}
diff --git a/SalesCatalog/Model/Product.cs b/yavscModel/FrontOffice/Catalog/Product.cs
similarity index 96%
rename from SalesCatalog/Model/Product.cs
rename to yavscModel/FrontOffice/Catalog/Product.cs
index 4f7cda8b..f4478180 100644
--- a/SalesCatalog/Model/Product.cs
+++ b/yavscModel/FrontOffice/Catalog/Product.cs
@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	/// <summary>
 	/// Product.
diff --git a/SalesCatalog/Model/ProductCategory.cs b/yavscModel/FrontOffice/Catalog/ProductCategory.cs
similarity index 93%
rename from SalesCatalog/Model/ProductCategory.cs
rename to yavscModel/FrontOffice/Catalog/ProductCategory.cs
index be88b5b9..5a72bac3 100644
--- a/SalesCatalog/Model/ProductCategory.cs
+++ b/yavscModel/FrontOffice/Catalog/ProductCategory.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class ProductCategory
 	{
diff --git a/SalesCatalog/Model/ProductImage.cs b/yavscModel/FrontOffice/Catalog/ProductImage.cs
similarity index 91%
rename from SalesCatalog/Model/ProductImage.cs
rename to yavscModel/FrontOffice/Catalog/ProductImage.cs
index 83bc5822..f4d96860 100644
--- a/SalesCatalog/Model/ProductImage.cs
+++ b/yavscModel/FrontOffice/Catalog/ProductImage.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class ProductImage: FormElement
 	{
diff --git a/SalesCatalog/Model/RadioButton.cs b/yavscModel/FrontOffice/Catalog/RadioButton.cs
similarity index 92%
rename from SalesCatalog/Model/RadioButton.cs
rename to yavscModel/FrontOffice/Catalog/RadioButton.cs
index ecf36bf2..8fcdd971 100644
--- a/SalesCatalog/Model/RadioButton.cs
+++ b/yavscModel/FrontOffice/Catalog/RadioButton.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class RadioButton:FormInput
 	{
diff --git a/SalesCatalog/Model/SaleForm.cs b/yavscModel/FrontOffice/Catalog/SaleForm.cs
similarity index 95%
rename from SalesCatalog/Model/SaleForm.cs
rename to yavscModel/FrontOffice/Catalog/SaleForm.cs
index ea4f0c4e..950c2773 100644
--- a/SalesCatalog/Model/SaleForm.cs
+++ b/yavscModel/FrontOffice/Catalog/SaleForm.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class SaleForm
 	{
diff --git a/SalesCatalog/Model/Scalar.cs b/yavscModel/FrontOffice/Catalog/Scalar.cs
similarity index 83%
rename from SalesCatalog/Model/Scalar.cs
rename to yavscModel/FrontOffice/Catalog/Scalar.cs
index 705d7111..e543789b 100644
--- a/SalesCatalog/Model/Scalar.cs
+++ b/yavscModel/FrontOffice/Catalog/Scalar.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public abstract class Scalar
 	{
diff --git a/SalesCatalog/Model/SelectInput.cs b/yavscModel/FrontOffice/Catalog/SelectInput.cs
similarity index 94%
rename from SalesCatalog/Model/SelectInput.cs
rename to yavscModel/FrontOffice/Catalog/SelectInput.cs
index a3e5e195..f96af152 100644
--- a/SalesCatalog/Model/SelectInput.cs
+++ b/yavscModel/FrontOffice/Catalog/SelectInput.cs
@@ -2,7 +2,7 @@ using System;
 using System.Text;
 using System.Web.Mvc;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class SelectInput: FormInput
 	{
diff --git a/SalesCatalog/Model/SelectItem.cs b/yavscModel/FrontOffice/Catalog/SelectItem.cs
similarity index 90%
rename from SalesCatalog/Model/SelectItem.cs
rename to yavscModel/FrontOffice/Catalog/SelectItem.cs
index 9ac5cafc..1c56cdfc 100644
--- a/SalesCatalog/Model/SelectItem.cs
+++ b/yavscModel/FrontOffice/Catalog/SelectItem.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class SelectItem
 	{ 
diff --git a/SalesCatalog/Model/Service.cs b/yavscModel/FrontOffice/Catalog/Service.cs
similarity index 94%
rename from SalesCatalog/Model/Service.cs
rename to yavscModel/FrontOffice/Catalog/Service.cs
index 9c153125..a2a39142 100644
--- a/SalesCatalog/Model/Service.cs
+++ b/yavscModel/FrontOffice/Catalog/Service.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class Service : Product
 	{
diff --git a/SalesCatalog/Model/StockStatus.cs b/yavscModel/FrontOffice/Catalog/StockStatus.cs
similarity index 67%
rename from SalesCatalog/Model/StockStatus.cs
rename to yavscModel/FrontOffice/Catalog/StockStatus.cs
index b4129b4e..9dfa24f0 100644
--- a/SalesCatalog/Model/StockStatus.cs
+++ b/yavscModel/FrontOffice/Catalog/StockStatus.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public enum StockStatus
 	{
diff --git a/SalesCatalog/Model/Text.cs b/yavscModel/FrontOffice/Catalog/Text.cs
similarity index 82%
rename from SalesCatalog/Model/Text.cs
rename to yavscModel/FrontOffice/Catalog/Text.cs
index ab223c01..d2c38237 100644
--- a/SalesCatalog/Model/Text.cs
+++ b/yavscModel/FrontOffice/Catalog/Text.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class Text: FormElement
 	{
diff --git a/SalesCatalog/Model/TextInput.cs b/yavscModel/FrontOffice/Catalog/TextInput.cs
similarity index 97%
rename from SalesCatalog/Model/TextInput.cs
rename to yavscModel/FrontOffice/Catalog/TextInput.cs
index d021392f..4f7e4f43 100644
--- a/SalesCatalog/Model/TextInput.cs
+++ b/yavscModel/FrontOffice/Catalog/TextInput.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public class TextInput:FormInput
 	{
diff --git a/SalesCatalog/Model/Unit.cs b/yavscModel/FrontOffice/Catalog/Unit.cs
similarity index 88%
rename from SalesCatalog/Model/Unit.cs
rename to yavscModel/FrontOffice/Catalog/Unit.cs
index 8b64aea6..bafd9e1d 100644
--- a/SalesCatalog/Model/Unit.cs
+++ b/yavscModel/FrontOffice/Catalog/Unit.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace SalesCatalog.Model
+namespace Yavsc.Model.FrontOffice
 {
 	public abstract class Unit
 	{
diff --git a/yavscModel/FrontOffice/Commande.cs b/yavscModel/FrontOffice/Commande.cs
index 0946b92f..4aa62c3e 100644
--- a/yavscModel/FrontOffice/Commande.cs
+++ b/yavscModel/FrontOffice/Commande.cs
@@ -1,9 +1,8 @@
 using System;
 using Yavsc;
-using SalesCatalog;
-using SalesCatalog.Model;
 using System.Collections.Specialized;
 using Yavsc.Model.WorkFlow;
+using Newtonsoft.Json;
 
 
 namespace Yavsc.Model.FrontOffice
@@ -13,6 +12,9 @@ namespace Yavsc.Model.FrontOffice
 		public DateTime CreationDate { get; set; }
 		public long Id { get; set; }
 		public string ProdRef { get; set; }
+
+		public StringDictionary Parameters = new StringDictionary();
+
 		public Commande() {
 		}
 
@@ -22,6 +24,11 @@ namespace Yavsc.Model.FrontOffice
 			// string catref=collection["catref"]; // Catalog Url from which formdata has been built
 			cmd.ProdRef=collection["ref"]; // Required product reference
 			cmd.CreationDate = DateTime.Now;
+
+			// stores the parameters:
+			foreach (string key in collection.AllKeys) {
+				cmd.Parameters.Add (key, collection [key]);
+			}
 			WorkFlowManager wm = new WorkFlowManager ();
 			wm.RegisterCommand (cmd); // sets cmd.Id
 			return cmd;
diff --git a/yavscModel/WorkFlow/WorkFlowManager.cs b/yavscModel/WorkFlow/WorkFlowManager.cs
index d9014dc8..b9215b0b 100644
--- a/yavscModel/WorkFlow/WorkFlowManager.cs
+++ b/yavscModel/WorkFlow/WorkFlowManager.cs
@@ -3,7 +3,6 @@ using Yavsc.Model.WorkFlow;
 using System.Configuration;
 using Yavsc.Model.WorkFlow.Configuration;
 using System.Collections.Specialized;
-using SalesCatalog.Model;
 using Yavsc.Model.FrontOffice;
 
 namespace Yavsc.Model.WorkFlow
@@ -111,7 +110,7 @@ namespace Yavsc.Model.WorkFlow
 		{
 			if (!string.IsNullOrWhiteSpace(productid)) {
 				if (Catalog == null)
-					Catalog = SalesCatalog.CatalogManager.GetCatalog ("/WorkFlowApi");
+					Catalog = CatalogManager.GetCatalog ("/WorkFlowApi");
 				if (Catalog == null)
 					throw new Exception ("No catalog");
 				Product p = Catalog.FindProduct (productid);
diff --git a/yavscModel/YavscModel.csproj b/yavscModel/YavscModel.csproj
index b2ddb0f6..3b0bf6f4 100644
--- a/yavscModel/YavscModel.csproj
+++ b/yavscModel/YavscModel.csproj
@@ -99,6 +99,40 @@
     <Compile Include="RssFeeds.cs" />
     <Compile Include="FrontOffice\Commande.cs" />
     <Compile Include="FrontOffice\Basket.cs" />
+    <Compile Include="FrontOffice\Catalog\Brand.cs" />
+    <Compile Include="FrontOffice\Catalog\Catalog.cs" />
+    <Compile Include="FrontOffice\Catalog\CheckBox.cs" />
+    <Compile Include="FrontOffice\Catalog\Currency.cs" />
+    <Compile Include="FrontOffice\Catalog\Euro.cs" />
+    <Compile Include="FrontOffice\Catalog\FilesInput.cs" />
+    <Compile Include="FrontOffice\Catalog\FormElement.cs" />
+    <Compile Include="FrontOffice\Catalog\FormInput.cs" />
+    <Compile Include="FrontOffice\Catalog\Label.cs" />
+    <Compile Include="FrontOffice\Catalog\Link.cs" />
+    <Compile Include="FrontOffice\Catalog\Note.cs" />
+    <Compile Include="FrontOffice\Catalog\Option.cs" />
+    <Compile Include="FrontOffice\Catalog\Period.cs" />
+    <Compile Include="FrontOffice\Catalog\PhysicalProduct.cs" />
+    <Compile Include="FrontOffice\Catalog\Price.cs" />
+    <Compile Include="FrontOffice\Catalog\Product.cs" />
+    <Compile Include="FrontOffice\Catalog\ProductCategory.cs" />
+    <Compile Include="FrontOffice\Catalog\ProductImage.cs" />
+    <Compile Include="FrontOffice\Catalog\RadioButton.cs" />
+    <Compile Include="FrontOffice\Catalog\SaleForm.cs" />
+    <Compile Include="FrontOffice\Catalog\Scalar.cs" />
+    <Compile Include="FrontOffice\Catalog\SelectInput.cs" />
+    <Compile Include="FrontOffice\Catalog\SelectItem.cs" />
+    <Compile Include="FrontOffice\Catalog\Service.cs" />
+    <Compile Include="FrontOffice\Catalog\StockStatus.cs" />
+    <Compile Include="FrontOffice\Catalog\Text.cs" />
+    <Compile Include="FrontOffice\Catalog\TextInput.cs" />
+    <Compile Include="FrontOffice\Catalog\Unit.cs" />
+    <Compile Include="FrontOffice\Catalog\Configuration\CatalogProviderConfigurationElement.cs" />
+    <Compile Include="FrontOffice\Catalog\Configuration\CatalogProvidersConfigurationCollection.cs" />
+    <Compile Include="FrontOffice\Catalog\Configuration\CatalogProvidersConfigurationSection.cs" />
+    <Compile Include="FrontOffice\Catalog\CatalogHelper.cs" />
+    <Compile Include="FrontOffice\Catalog\CatalogManager.cs" />
+    <Compile Include="FrontOffice\Catalog\CatalogProvider.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -109,12 +143,7 @@
     <Folder Include="FileSystem\" />
     <Folder Include="Google\" />
     <Folder Include="FrontOffice\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SalesCatalog\SalesCatalog.csproj">
-      <Project>{90BF2234-7252-4CD5-B2A4-17501B19279B}</Project>
-      <Name>SalesCatalog</Name>
-    </ProjectReference>
+    <Folder Include="FrontOffice\Catalog\" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
diff --git a/yavscclient/MyClass.cs b/yavscclient/MyClass.cs
index 6e2594aa..a6c0c5f3 100644
--- a/yavscclient/MyClass.cs
+++ b/yavscclient/MyClass.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;
-using SalesCatalog.Model;
 using System.Net.Http.Headers;
 using System.Collections.Generic;
 using System.Net.Http.Formatting;
 using Newtonsoft.Json;
+using Yavsc.Model.FrontOffice;
 
 namespace Yavsc
 {
diff --git a/yavscclient/YavscClient.csproj b/yavscclient/YavscClient.csproj
index 8e34c413..4d7b0b70 100644
--- a/yavscclient/YavscClient.csproj
+++ b/yavscclient/YavscClient.csproj
@@ -51,5 +51,9 @@
       <Project>{90BF2234-7252-4CD5-B2A4-17501B19279B}</Project>
       <Name>SalesCatalog</Name>
     </ProjectReference>
+    <ProjectReference Include="..\yavscModel\YavscModel.csproj">
+      <Project>{68F5B80A-616E-4C3C-91A0-828AA40000BD}</Project>
+      <Name>YavscModel</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
\ No newline at end of file