diff --git a/YavscLib/YavscLib.csproj b/YavscLib/YavscLib.csproj
index e1d6d593..68fc7847 100644
--- a/YavscLib/YavscLib.csproj
+++ b/YavscLib/YavscLib.csproj
@@ -73,20 +73,29 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="IAccountBalance.cs" />
-    <Compile Include="IActivity.cs" />
-    <Compile Include="IApplicationUser.cs" />
+    <Compile Include="Billing\IAccountBalance.cs" />
+    <Compile Include="Billing\IcommandLine.cs" />
+    <Compile Include="Billing\IEstimate.cs" />
+    <Compile Include="Blogspot\IBlog.cs" />
     <Compile Include="IBaseTrackedEntity.cs" />
-    <Compile Include="IBlog.cs" />
-    <Compile Include="ICircle.cs" />
-    <Compile Include="ICircleMember.cs" />
-    <Compile Include="ICommandForm.cs" />
-    <Compile Include="IContact.cs" />
-    <Compile Include="ICoWorking.cs" />
-    <Compile Include="IGoogleCloudMobileDeclaration.cs" />
-    <Compile Include="ILocation.cs" />
-    <Compile Include="IPosition.cs" />
+    <Compile Include="Identity\IApplicationUser.cs" />
+    <Compile Include="Identity\IChatUserInfo.cs" />
+    <Compile Include="Identity\ICircle.cs" />
+    <Compile Include="Identity\ICircleMember.cs" />
+    <Compile Include="Identity\Security\ICircleAuthorization.cs" />
+    <Compile Include="Identity\Security\ICircleAuthorized.cs" />
+    <Compile Include="IT\ICode.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Workflow\IActivity.cs" />
+    <Compile Include="Workflow\IBlackListed.cs" />
+    <Compile Include="Workflow\ICommandForm.cs" />
+    <Compile Include="Workflow\IContact.cs" />
+    <Compile Include="Workflow\ICoWorking.cs" />
+    <Compile Include="Workflow\IGoogleCloudMobileDeclaration.cs" />
+    <Compile Include="Workflow\ILocation.cs" />
+    <Compile Include="Workflow\IPerformerProfile.cs" />
+    <Compile Include="Workflow\IPosition.cs" />
+    <Compile Include="Workflow\ISpecializationSettings.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -97,8 +106,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="project.json" />
-    <Compile Include="IChatUserInfo.cs" />
-    <Compile Include="IBlackListed.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">