diff --git a/Yavsc/Views/Activity/Create.cshtml b/Yavsc/Views/Activity/Create.cshtml
index 2542afbd..fa9884cf 100644
--- a/Yavsc/Views/Activity/Create.cshtml
+++ b/Yavsc/Views/Activity/Create.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Activity
+@model Activity
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/Activity/Delete.cshtml b/Yavsc/Views/Activity/Delete.cshtml
index a80759ef..d72db6a2 100644
--- a/Yavsc/Views/Activity/Delete.cshtml
+++ b/Yavsc/Views/Activity/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Activity
+@model Activity
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/Activity/Details.cshtml b/Yavsc/Views/Activity/Details.cshtml
index 34f29b02..ff53e620 100644
--- a/Yavsc/Views/Activity/Details.cshtml
+++ b/Yavsc/Views/Activity/Details.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Activity
+@model Activity
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/Activity/Edit.cshtml b/Yavsc/Views/Activity/Edit.cshtml
index 2331e999..7d87d493 100644
--- a/Yavsc/Views/Activity/Edit.cshtml
+++ b/Yavsc/Views/Activity/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Activity
+@model Activity
 
 @{
     ViewData["Title"] = "Edit";
diff --git a/Yavsc/Views/Activity/Index.cshtml b/Yavsc/Views/Activity/Index.cshtml
index 78a4f758..713bcdd7 100644
--- a/Yavsc/Views/Activity/Index.cshtml
+++ b/Yavsc/Views/Activity/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Activity>
+@model IEnumerable<Activity>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/Blogspot/Create.cshtml b/Yavsc/Views/Blogspot/Create.cshtml
index 155bb725..f3ea3070 100644
--- a/Yavsc/Views/Blogspot/Create.cshtml
+++ b/Yavsc/Views/Blogspot/Create.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Blog
+@model Blog
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/Blogspot/Delete.cshtml b/Yavsc/Views/Blogspot/Delete.cshtml
index f006f6c3..0d0fcaa3 100644
--- a/Yavsc/Views/Blogspot/Delete.cshtml
+++ b/Yavsc/Views/Blogspot/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Blog
+@model Blog
 @{
     ViewData["Title"] = "Delete";
 }
diff --git a/Yavsc/Views/Blogspot/Details.cshtml b/Yavsc/Views/Blogspot/Details.cshtml
index 64c2cbea..4858509b 100644
--- a/Yavsc/Views/Blogspot/Details.cshtml
+++ b/Yavsc/Views/Blogspot/Details.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Blog
+@model Blog
 
 @{
     ViewData["Title"]=Model.Title;
@@ -18,13 +18,13 @@
 <div class="meta"> 
     @SR["Author"] :  @Model.Author.UserName -
        
-            @SR["Modified"] :
+    @SR["Modified"] :
 
-            @Html.DisplayFor(model => model.DateModified) -
-        
-            @SR["Created"] :
-       
-            @Html.DisplayFor(model => model.DateCreated) 
+    @Html.DisplayFor(model => model.DateModified) -
+
+    @SR["Created"] :
+
+    @Html.DisplayFor(model => model.DateCreated) 
  </div>
      
 </div>
diff --git a/Yavsc/Views/Blogspot/Edit.cshtml b/Yavsc/Views/Blogspot/Edit.cshtml
index 91c89d4e..a0537cc2 100644
--- a/Yavsc/Views/Blogspot/Edit.cshtml
+++ b/Yavsc/Views/Blogspot/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Blog
+@model Blog
 
 @{
    ViewData["Title"] = SR["Blog post edition"];
diff --git a/Yavsc/Views/Blogspot/Index.cshtml b/Yavsc/Views/Blogspot/Index.cshtml
index c3139af6..57dabfd3 100644
--- a/Yavsc/Views/Blogspot/Index.cshtml
+++ b/Yavsc/Views/Blogspot/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Blog>
+@model IEnumerable<Blog>
 @{
     ViewData["Title"] = "Index";
     
diff --git a/Yavsc/Views/Blogspot/title.cshtml b/Yavsc/Views/Blogspot/title.cshtml
index 324185d6..b8dc1856 100644
--- a/Yavsc/Views/Blogspot/title.cshtml
+++ b/Yavsc/Views/Blogspot/title.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Blog>
+@model IEnumerable<Blog>
 @{
     ViewData["Title"] = "Title";
 }
diff --git a/Yavsc/Views/Blogspot/userposts.cshtml b/Yavsc/Views/Blogspot/userposts.cshtml
index 419c9963..29cbe68d 100644
--- a/Yavsc/Views/Blogspot/userposts.cshtml
+++ b/Yavsc/Views/Blogspot/userposts.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Blog>
+@model IEnumerable<Blog>
 @{
     ViewData["Title"] = "User posts";
 }
diff --git a/Yavsc/Views/Circle/Create.cshtml b/Yavsc/Views/Circle/Create.cshtml
index b7879500..60ad0f81 100644
--- a/Yavsc/Views/Circle/Create.cshtml
+++ b/Yavsc/Views/Circle/Create.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Relationship.Circle
+@model Circle
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/Circle/Delete.cshtml b/Yavsc/Views/Circle/Delete.cshtml
index f1f408f9..1b8ad5e7 100644
--- a/Yavsc/Views/Circle/Delete.cshtml
+++ b/Yavsc/Views/Circle/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Relationship.Circle
+@model Circle
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/Circle/Details.cshtml b/Yavsc/Views/Circle/Details.cshtml
index 3952986d..4347536f 100644
--- a/Yavsc/Views/Circle/Details.cshtml
+++ b/Yavsc/Views/Circle/Details.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Relationship.Circle
+@model Circle
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/Circle/Edit.cshtml b/Yavsc/Views/Circle/Edit.cshtml
index d40f18b7..5f54ed15 100644
--- a/Yavsc/Views/Circle/Edit.cshtml
+++ b/Yavsc/Views/Circle/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Relationship.Circle
+@model Circle
 
 @{
     ViewData["Title"] = "Edit";
diff --git a/Yavsc/Views/Circle/Index.cshtml b/Yavsc/Views/Circle/Index.cshtml
index b7c03810..23f5aee9 100644
--- a/Yavsc/Views/Circle/Index.cshtml
+++ b/Yavsc/Views/Circle/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Relationship.Circle>
+@model IEnumerable<Circle>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/CircleMembers/Create.cshtml b/Yavsc/Views/CircleMembers/Create.cshtml
index d10a6740..ba1be413 100644
--- a/Yavsc/Views/CircleMembers/Create.cshtml
+++ b/Yavsc/Views/CircleMembers/Create.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Relationship.CircleMember
+@model CircleMember
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/CircleMembers/Delete.cshtml b/Yavsc/Views/CircleMembers/Delete.cshtml
index 400e7fb0..c28db7fc 100644
--- a/Yavsc/Views/CircleMembers/Delete.cshtml
+++ b/Yavsc/Views/CircleMembers/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Relationship.CircleMember
+@model CircleMember
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/CircleMembers/Details.cshtml b/Yavsc/Views/CircleMembers/Details.cshtml
index e01025f0..9573e287 100644
--- a/Yavsc/Views/CircleMembers/Details.cshtml
+++ b/Yavsc/Views/CircleMembers/Details.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Relationship.CircleMember
+@model CircleMember
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/CircleMembers/Edit.cshtml b/Yavsc/Views/CircleMembers/Edit.cshtml
index 121df738..7157e29f 100644
--- a/Yavsc/Views/CircleMembers/Edit.cshtml
+++ b/Yavsc/Views/CircleMembers/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Relationship.CircleMember
+@model CircleMember
 
 @{
     ViewData["Title"] = "Edit";
diff --git a/Yavsc/Views/CircleMembers/Index.cshtml b/Yavsc/Views/CircleMembers/Index.cshtml
index 13dad2f1..6f3ba67e 100644
--- a/Yavsc/Views/CircleMembers/Index.cshtml
+++ b/Yavsc/Views/CircleMembers/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Relationship.CircleMember>
+@model IEnumerable<CircleMember>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/Client/Create.cshtml b/Yavsc/Views/Client/Create.cshtml
index 238d71b7..551c7a72 100644
--- a/Yavsc/Views/Client/Create.cshtml
+++ b/Yavsc/Views/Client/Create.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Auth.Client
+@model Client
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/Client/Delete.cshtml b/Yavsc/Views/Client/Delete.cshtml
index 0f0dc8aa..b920ec62 100644
--- a/Yavsc/Views/Client/Delete.cshtml
+++ b/Yavsc/Views/Client/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Auth.Client
+@model Client
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/Client/Details.cshtml b/Yavsc/Views/Client/Details.cshtml
index d4905039..8cd66207 100644
--- a/Yavsc/Views/Client/Details.cshtml
+++ b/Yavsc/Views/Client/Details.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Auth.Client
+@model Client
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/Client/Edit.cshtml b/Yavsc/Views/Client/Edit.cshtml
index ae9f315d..407829c4 100644
--- a/Yavsc/Views/Client/Edit.cshtml
+++ b/Yavsc/Views/Client/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Auth.Client
+@model Client
 
 @{
     ViewData["Title"] = "Edit";
diff --git a/Yavsc/Views/Client/Index.cshtml b/Yavsc/Views/Client/Index.cshtml
index e2f4e32f..4b3d9e99 100644
--- a/Yavsc/Views/Client/Index.cshtml
+++ b/Yavsc/Views/Client/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Auth.Client>
+@model IEnumerable<Client>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/CoWorking/Create.cshtml b/Yavsc/Views/CoWorking/Create.cshtml
index ccdb8655..5378fbfa 100644
--- a/Yavsc/Views/CoWorking/Create.cshtml
+++ b/Yavsc/Views/CoWorking/Create.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.CoWorking
+@model CoWorking
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/CoWorking/Delete.cshtml b/Yavsc/Views/CoWorking/Delete.cshtml
index 4a97291f..eac4543d 100644
--- a/Yavsc/Views/CoWorking/Delete.cshtml
+++ b/Yavsc/Views/CoWorking/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.CoWorking
+@model CoWorking
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/CoWorking/Details.cshtml b/Yavsc/Views/CoWorking/Details.cshtml
index e3f1e954..385909fb 100644
--- a/Yavsc/Views/CoWorking/Details.cshtml
+++ b/Yavsc/Views/CoWorking/Details.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.CoWorking
+@model CoWorking
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/CoWorking/Edit.cshtml b/Yavsc/Views/CoWorking/Edit.cshtml
index 726fa70b..9c89fbb0 100644
--- a/Yavsc/Views/CoWorking/Edit.cshtml
+++ b/Yavsc/Views/CoWorking/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.CoWorking
+@model CoWorking
 
 @{
     ViewData["Title"] = "Edit";
diff --git a/Yavsc/Views/CoWorking/Index.cshtml b/Yavsc/Views/CoWorking/Index.cshtml
index dde2f420..b451bcd4 100644
--- a/Yavsc/Views/CoWorking/Index.cshtml
+++ b/Yavsc/Views/CoWorking/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Workflow.CoWorking>
+@model IEnumerable<CoWorking>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/CommandForms/Create.cshtml b/Yavsc/Views/CommandForms/Create.cshtml
index 9500afaa..e023487f 100644
--- a/Yavsc/Views/CommandForms/Create.cshtml
+++ b/Yavsc/Views/CommandForms/Create.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.CommandForm
+@model CommandForm
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/CommandForms/Delete.cshtml b/Yavsc/Views/CommandForms/Delete.cshtml
index f0c65ba8..53b831e0 100644
--- a/Yavsc/Views/CommandForms/Delete.cshtml
+++ b/Yavsc/Views/CommandForms/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.CommandForm
+@model CommandForm
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/CommandForms/Details.cshtml b/Yavsc/Views/CommandForms/Details.cshtml
index 066471a0..f68b8b99 100644
--- a/Yavsc/Views/CommandForms/Details.cshtml
+++ b/Yavsc/Views/CommandForms/Details.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.CommandForm
+@model CommandForm
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/CommandForms/Edit.cshtml b/Yavsc/Views/CommandForms/Edit.cshtml
index 959537ad..92a02c57 100644
--- a/Yavsc/Views/CommandForms/Edit.cshtml
+++ b/Yavsc/Views/CommandForms/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.CommandForm
+@model CommandForm
 
 @{
     ViewData["Title"] = "Edit";
diff --git a/Yavsc/Views/CommandForms/Index.cshtml b/Yavsc/Views/CommandForms/Index.cshtml
index ea331e06..b8d02526 100644
--- a/Yavsc/Views/CommandForms/Index.cshtml
+++ b/Yavsc/Views/CommandForms/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Workflow.CommandForm>
+@model IEnumerable<CommandForm>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/Do/Create.cshtml b/Yavsc/Views/Do/Create.cshtml
index 7835aa54..7f3d7f37 100644
--- a/Yavsc/Views/Do/Create.cshtml
+++ b/Yavsc/Views/Do/Create.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.UserActivity
+@model UserActivity
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/Do/CreateFor.cshtml b/Yavsc/Views/Do/CreateFor.cshtml
index f6935e6d..0dbead9d 100644
--- a/Yavsc/Views/Do/CreateFor.cshtml
+++ b/Yavsc/Views/Do/CreateFor.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.UserActivity
+@model UserActivity
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/Do/Delete.cshtml b/Yavsc/Views/Do/Delete.cshtml
index 60dead1d..8e496a53 100644
--- a/Yavsc/Views/Do/Delete.cshtml
+++ b/Yavsc/Views/Do/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.UserActivity
+@model UserActivity
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/Do/Details.cshtml b/Yavsc/Views/Do/Details.cshtml
index 4970cd99..432bfa6a 100644
--- a/Yavsc/Views/Do/Details.cshtml
+++ b/Yavsc/Views/Do/Details.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.UserActivity
+@model UserActivity
 
 @{
     ViewData["Title"] = SR["Details"];
diff --git a/Yavsc/Views/Do/Edit.cshtml b/Yavsc/Views/Do/Edit.cshtml
index 1b82b58c..ebf97ea8 100644
--- a/Yavsc/Views/Do/Edit.cshtml
+++ b/Yavsc/Views/Do/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Workflow.UserActivity 
+@model UserActivity 
 @{ ViewData["Title"] = "Edit"; }
 
 <h2>Edit</h2>
diff --git a/Yavsc/Views/Do/Index.cshtml b/Yavsc/Views/Do/Index.cshtml
index dac3cb38..ee411b60 100644
--- a/Yavsc/Views/Do/Index.cshtml
+++ b/Yavsc/Views/Do/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Workflow.UserActivity>
+@model IEnumerable<UserActivity>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/Do/Yavsc.Models.Booking.MusicianSettingsEditor.fr.cshtml b/Yavsc/Views/Do/Yavsc.Models.Booking.MusicianSettingsEditor.fr.cshtml
index 71c1d4b8..b7b702f0 100644
--- a/Yavsc/Views/Do/Yavsc.Models.Booking.MusicianSettingsEditor.fr.cshtml
+++ b/Yavsc/Views/Do/Yavsc.Models.Booking.MusicianSettingsEditor.fr.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Booking.MusicianSettings
+@model MusicianSettings
 @{
      ViewBag.YetAvailableInstruments = _context.Instrument.Where(i=> !_context.MusicianSettings.Any(s=>s.UserId==id && s.Instrumentation.Any(j=>j.Id == i.Id)))
       .Select(k=>new SelectListItem { Text = k.Name });
diff --git a/Yavsc/Views/Instrumentation/Create.cshtml b/Yavsc/Views/Instrumentation/Create.cshtml
index 01868a7b..7f59f176 100644
--- a/Yavsc/Views/Instrumentation/Create.cshtml
+++ b/Yavsc/Views/Instrumentation/Create.cshtml
@@ -1,5 +1,5 @@
 
-@model Yavsc.Models.Booking.Profiles.Instrumentation
+@model Instrumentation
 
 @{
     ViewBag.SettingLabel = SR["Yavsc.Models.Booking.Profiles.Instrumentation"];
diff --git a/Yavsc/Views/Instrumentation/Delete.cshtml b/Yavsc/Views/Instrumentation/Delete.cshtml
index 34b50570..2f0465e1 100644
--- a/Yavsc/Views/Instrumentation/Delete.cshtml
+++ b/Yavsc/Views/Instrumentation/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Booking.Profiles.Instrumentation
+@model Instrumentation
 
 @{
   
diff --git a/Yavsc/Views/Instrumentation/Details.cshtml b/Yavsc/Views/Instrumentation/Details.cshtml
index 127b74ac..9447b05d 100644
--- a/Yavsc/Views/Instrumentation/Details.cshtml
+++ b/Yavsc/Views/Instrumentation/Details.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Booking.Profiles.Instrumentation
+@model Instrumentation
 
 @{
    
diff --git a/Yavsc/Views/Instrumentation/Edit.cshtml b/Yavsc/Views/Instrumentation/Edit.cshtml
index fcd3b73f..39c5e386 100644
--- a/Yavsc/Views/Instrumentation/Edit.cshtml
+++ b/Yavsc/Views/Instrumentation/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Booking.Profiles.Instrumentation
+@model Instrumentation
 @{
  
     ViewBag.SettingLabel = SR["Yavsc.Models.Booking.Profiles.Instrumentation"];
diff --git a/Yavsc/Views/Instrumentation/Index.cshtml b/Yavsc/Views/Instrumentation/Index.cshtml
index c86385f9..85c1a1bb 100644
--- a/Yavsc/Views/Instrumentation/Index.cshtml
+++ b/Yavsc/Views/Instrumentation/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Booking.Profiles.Instrumentation>
+@model IEnumerable<Instrumentation>
 
 @{
    
diff --git a/Yavsc/Views/Instruments/Create.cshtml b/Yavsc/Views/Instruments/Create.cshtml
index a0fbbfb9..747d7f2e 100644
--- a/Yavsc/Views/Instruments/Create.cshtml
+++ b/Yavsc/Views/Instruments/Create.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Booking.Instrument
+@model Instrument
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/Instruments/Delete.cshtml b/Yavsc/Views/Instruments/Delete.cshtml
index 438a6fad..86ee3934 100644
--- a/Yavsc/Views/Instruments/Delete.cshtml
+++ b/Yavsc/Views/Instruments/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Booking.Instrument
+@model Instrument
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/Instruments/Details.cshtml b/Yavsc/Views/Instruments/Details.cshtml
index 47d9155e..5760208d 100644
--- a/Yavsc/Views/Instruments/Details.cshtml
+++ b/Yavsc/Views/Instruments/Details.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Booking.Instrument
+@model Instrument
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/Instruments/Edit.cshtml b/Yavsc/Views/Instruments/Edit.cshtml
index ca30dd70..89b1d0ec 100644
--- a/Yavsc/Views/Instruments/Edit.cshtml
+++ b/Yavsc/Views/Instruments/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Booking.Instrument
+@model Instrument
 
 @{
     ViewData["Title"] = "Edit";
diff --git a/Yavsc/Views/Instruments/Index.cshtml b/Yavsc/Views/Instruments/Index.cshtml
index 618b6da3..1509bd19 100644
--- a/Yavsc/Views/Instruments/Index.cshtml
+++ b/Yavsc/Views/Instruments/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Booking.Instrument>
+@model IEnumerable<Instrument>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/LocationTypes/Create.cshtml b/Yavsc/Views/LocationTypes/Create.cshtml
index aa2b17a2..8694e7c2 100644
--- a/Yavsc/Views/LocationTypes/Create.cshtml
+++ b/Yavsc/Views/LocationTypes/Create.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Relationship.LocationType
+@model LocationType
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/LocationTypes/Delete.cshtml b/Yavsc/Views/LocationTypes/Delete.cshtml
index aea8320c..791ec29d 100644
--- a/Yavsc/Views/LocationTypes/Delete.cshtml
+++ b/Yavsc/Views/LocationTypes/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Relationship.LocationType
+@model LocationType
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/LocationTypes/Details.cshtml b/Yavsc/Views/LocationTypes/Details.cshtml
index 7ab76bd8..a6eb44a7 100644
--- a/Yavsc/Views/LocationTypes/Details.cshtml
+++ b/Yavsc/Views/LocationTypes/Details.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Relationship.LocationType
+@model LocationType
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/LocationTypes/Edit.cshtml b/Yavsc/Views/LocationTypes/Edit.cshtml
index 9f6f78cb..386dc137 100644
--- a/Yavsc/Views/LocationTypes/Edit.cshtml
+++ b/Yavsc/Views/LocationTypes/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Relationship.LocationType
+@model LocationType
 
 @{
     ViewData["Title"] = "Edit";
diff --git a/Yavsc/Views/LocationTypes/Index.cshtml b/Yavsc/Views/LocationTypes/Index.cshtml
index e1dcdf73..2ddcbd0c 100644
--- a/Yavsc/Views/LocationTypes/Index.cshtml
+++ b/Yavsc/Views/LocationTypes/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Relationship.LocationType>
+@model IEnumerable<LocationType>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/MusicalTendencies/Create.cshtml b/Yavsc/Views/MusicalTendencies/Create.cshtml
index 0567c584..1d5ed688 100644
--- a/Yavsc/Views/MusicalTendencies/Create.cshtml
+++ b/Yavsc/Views/MusicalTendencies/Create.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Booking.MusicalTendency
+@model MusicalTendency
 
 @{
     ViewData["Title"] = "Create";
diff --git a/Yavsc/Views/MusicalTendencies/Delete.cshtml b/Yavsc/Views/MusicalTendencies/Delete.cshtml
index edd159e6..c37df44e 100644
--- a/Yavsc/Views/MusicalTendencies/Delete.cshtml
+++ b/Yavsc/Views/MusicalTendencies/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Booking.MusicalTendency
+@model MusicalTendency
 
 @{
     ViewData["Title"] = "Delete";
diff --git a/Yavsc/Views/MusicalTendencies/Details.cshtml b/Yavsc/Views/MusicalTendencies/Details.cshtml
index 1d0d5e5b..fb484b30 100644
--- a/Yavsc/Views/MusicalTendencies/Details.cshtml
+++ b/Yavsc/Views/MusicalTendencies/Details.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Booking.MusicalTendency
+@model MusicalTendency
 
 @{
     ViewData["Title"] = "Details";
diff --git a/Yavsc/Views/MusicalTendencies/Edit.cshtml b/Yavsc/Views/MusicalTendencies/Edit.cshtml
index 661041ab..9be786f7 100644
--- a/Yavsc/Views/MusicalTendencies/Edit.cshtml
+++ b/Yavsc/Views/MusicalTendencies/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Yavsc.Models.Booking.MusicalTendency
+@model MusicalTendency
 
 @{
     ViewData["Title"] = "Edit";
diff --git a/Yavsc/Views/MusicalTendencies/Index.cshtml b/Yavsc/Views/MusicalTendencies/Index.cshtml
index c8c6f879..75f54808 100644
--- a/Yavsc/Views/MusicalTendencies/Index.cshtml
+++ b/Yavsc/Views/MusicalTendencies/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Yavsc.Models.Booking.MusicalTendency>
+@model IEnumerable<MusicalTendency>
 
 @{
     ViewData["Title"] = "Index";
diff --git a/Yavsc/Views/OAuth/Authorize.cshtml b/Yavsc/Views/OAuth/Authorize.cshtml
index 554184f2..db295196 100644
--- a/Yavsc/Views/OAuth/Authorize.cshtml
+++ b/Yavsc/Views/OAuth/Authorize.cshtml
@@ -1,7 +1,7 @@
 @using Microsoft.AspNet.Http.Authentication
 @using Microsoft.AspNet.WebUtilities
 @using System.Security.Claims
-@model Yavsc.Models.Auth.AuthorisationView
+@model AuthorisationView
 @{
     ViewBag.Title = @SR["Authorize"];
 }
diff --git a/Yavsc/Views/_ViewImports.cshtml b/Yavsc/Views/_ViewImports.cshtml
index 968f4095..49ecd4bc 100755
--- a/Yavsc/Views/_ViewImports.cshtml
+++ b/Yavsc/Views/_ViewImports.cshtml
@@ -10,8 +10,10 @@
 @using Yavsc.Helpers;
 @using Yavsc.Models;
 @using Yavsc.Models.Access;
+@using Yavsc.Models.Auth;
 @using Yavsc.Models.Google;
 @using Yavsc.Models.Booking;
+@using Yavsc.Models.Booking.Profiles;
 @using Yavsc.Models.Market;
 @using Yavsc.Models.Billing;
 @using Yavsc.Models.Workflow;
@@ -23,6 +25,7 @@
 @using Yavsc.ViewModels.Auth;
 @using Yavsc.ViewModels.Administration;
 @using Yavsc.ViewModels.Relationship;
+
        
 @inject IViewLocalizer LocString
 @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"