diff --git a/Yavsc/Services/IBankInterface.cs b/Yavsc.Abstract/Interfaces/IBankInterface.cs
similarity index 100%
rename from Yavsc/Services/IBankInterface.cs
rename to Yavsc.Abstract/Interfaces/IBankInterface.cs
diff --git a/Yavsc/Services/IBillingService.cs b/Yavsc.Abstract/Interfaces/IBillingService.cs
similarity index 100%
rename from Yavsc/Services/IBillingService.cs
rename to Yavsc.Abstract/Interfaces/IBillingService.cs
diff --git a/Yavsc/Services/IEmailSender.cs b/Yavsc.Abstract/Interfaces/IEmailSender.cs
similarity index 100%
rename from Yavsc/Services/IEmailSender.cs
rename to Yavsc.Abstract/Interfaces/IEmailSender.cs
diff --git a/Yavsc.Abstract/Interfaces/IBookQueryData.cs b/Yavsc.Abstract/Interfaces/Models/IBookQueryData.cs
similarity index 100%
rename from Yavsc.Abstract/Interfaces/IBookQueryData.cs
rename to Yavsc.Abstract/Interfaces/Models/IBookQueryData.cs
diff --git a/Yavsc.Abstract/Interfaces/ICircleMember.cs b/Yavsc.Abstract/Interfaces/Models/ICircleMember.cs
similarity index 100%
rename from Yavsc.Abstract/Interfaces/ICircleMember.cs
rename to Yavsc.Abstract/Interfaces/Models/ICircleMember.cs
diff --git a/Yavsc.Abstract/Interfaces/ICommentable.cs b/Yavsc.Abstract/Interfaces/Models/ICommentable.cs
similarity index 100%
rename from Yavsc.Abstract/Interfaces/ICommentable.cs
rename to Yavsc.Abstract/Interfaces/Models/ICommentable.cs
diff --git a/Yavsc.Abstract/Interfaces/IGoogleCloudMobileDeclaration.cs b/Yavsc.Abstract/Interfaces/Models/IGoogleCloudMobileDeclaration.cs
similarity index 100%
rename from Yavsc.Abstract/Interfaces/IGoogleCloudMobileDeclaration.cs
rename to Yavsc.Abstract/Interfaces/Models/IGoogleCloudMobileDeclaration.cs
diff --git a/Yavsc.Abstract/Interfaces/ILocation.cs b/Yavsc.Abstract/Interfaces/Models/ILocation.cs
similarity index 100%
rename from Yavsc.Abstract/Interfaces/ILocation.cs
rename to Yavsc.Abstract/Interfaces/Models/ILocation.cs
diff --git a/Yavsc.Abstract/Interfaces/INamedObject.cs b/Yavsc.Abstract/Interfaces/Models/INamedObject.cs
similarity index 100%
rename from Yavsc.Abstract/Interfaces/INamedObject.cs
rename to Yavsc.Abstract/Interfaces/Models/INamedObject.cs
diff --git a/Yavsc.Abstract/Interfaces/IOwned.cs b/Yavsc.Abstract/Interfaces/Models/IOwned.cs
similarity index 100%
rename from Yavsc.Abstract/Interfaces/IOwned.cs
rename to Yavsc.Abstract/Interfaces/Models/IOwned.cs
diff --git a/Yavsc.Abstract/Interfaces/IPosition.cs b/Yavsc.Abstract/Interfaces/Models/IPosition.cs
similarity index 100%
rename from Yavsc.Abstract/Interfaces/IPosition.cs
rename to Yavsc.Abstract/Interfaces/Models/IPosition.cs
diff --git a/Yavsc.Abstract/Interfaces/ITaggable.cs b/Yavsc.Abstract/Interfaces/Models/ITaggable.cs
similarity index 100%
rename from Yavsc.Abstract/Interfaces/ITaggable.cs
rename to Yavsc.Abstract/Interfaces/Models/ITaggable.cs
diff --git a/Yavsc/Services/ICalendarManager.cs b/Yavsc.Server/Interfaces/ICalendarManager.cs
similarity index 100%
rename from Yavsc/Services/ICalendarManager.cs
rename to Yavsc.Server/Interfaces/ICalendarManager.cs
diff --git a/Yavsc/Models/Calendar/IFreeDateSet.cs b/Yavsc.Server/Interfaces/IFreeDateSet.cs
similarity index 100%
rename from Yavsc/Models/Calendar/IFreeDateSet.cs
rename to Yavsc.Server/Interfaces/IFreeDateSet.cs
diff --git a/Yavsc/Models/Calendar/IScheduledEvent.cs b/Yavsc.Server/Interfaces/IScheduledEvent.cs
similarity index 100%
rename from Yavsc/Models/Calendar/IScheduledEvent.cs
rename to Yavsc.Server/Interfaces/IScheduledEvent.cs
diff --git a/Yavsc/Models/Calendar/Period.cs b/Yavsc.Server/Models/Calendar/Period.cs
similarity index 100%
rename from Yavsc/Models/Calendar/Period.cs
rename to Yavsc.Server/Models/Calendar/Period.cs
diff --git a/Yavsc/Models/Calendar/Periodicity.cs b/Yavsc.Server/Models/Calendar/Periodicity.cs
similarity index 100%
rename from Yavsc/Models/Calendar/Periodicity.cs
rename to Yavsc.Server/Models/Calendar/Periodicity.cs
diff --git a/Yavsc/Models/Calendar/ScheduledEvent.cs b/Yavsc.Server/Models/Calendar/ScheduledEvent.cs
similarity index 100%
rename from Yavsc/Models/Calendar/ScheduledEvent.cs
rename to Yavsc.Server/Models/Calendar/ScheduledEvent.cs
diff --git a/Yavsc/Models/Calendar/WeekDay.cs b/Yavsc.Server/Models/Calendar/WeekDay.cs
similarity index 100%
rename from Yavsc/Models/Calendar/WeekDay.cs
rename to Yavsc.Server/Models/Calendar/WeekDay.cs
diff --git a/Yavsc/ViewModels/Calendar/DateTimeChooserViewModel.cs b/Yavsc.Server/ViewModels/Calendar/DateTimeChooserViewModel.cs
similarity index 100%
rename from Yavsc/ViewModels/Calendar/DateTimeChooserViewModel.cs
rename to Yavsc.Server/ViewModels/Calendar/DateTimeChooserViewModel.cs
diff --git a/Yavsc/ViewModels/Calendar/SetGoogleCalendarViewModel.cs b/Yavsc.Server/ViewModels/Calendar/SetGoogleCalendarViewModel.cs
similarity index 100%
rename from Yavsc/ViewModels/Calendar/SetGoogleCalendarViewModel.cs
rename to Yavsc.Server/ViewModels/Calendar/SetGoogleCalendarViewModel.cs
diff --git a/Yavsc/ViewModels/Calendar/UpcomingEventsViewModel.cs b/Yavsc.Server/ViewModels/Calendar/UpcomingEventsViewModel.cs
similarity index 100%
rename from Yavsc/ViewModels/Calendar/UpcomingEventsViewModel.cs
rename to Yavsc.Server/ViewModels/Calendar/UpcomingEventsViewModel.cs