--- a/Implab/Implab.csproj	Thu Feb 04 02:43:05 2016 +0300
+++ b/Implab/Implab.csproj	Thu Feb 11 01:56:27 2016 +0300
@@ -75,7 +75,6 @@
     <Reference Include="mscorlib" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Component.cs" />
     <Compile Include="CustomEqualityComparer.cs" />
     <Compile Include="Diagnostics\ConsoleTraceListener.cs" />
     <Compile Include="Diagnostics\EventText.cs" />
@@ -85,7 +84,6 @@
     <Compile Include="Diagnostics\TraceLog.cs" />
     <Compile Include="Diagnostics\TraceEvent.cs" />
     <Compile Include="Diagnostics\TraceEventType.cs" />
-    <Compile Include="Disposable.cs" />
     <Compile Include="ICancellable.cs" />
     <Compile Include="IProgressHandler.cs" />
     <Compile Include="IProgressNotifier.cs" />
@@ -130,8 +128,6 @@
     <Compile Include="Parsing\StarToken.cs" />
     <Compile Include="Parsing\SymbolToken.cs" />
     <Compile Include="Parsing\Token.cs" />
-    <Compile Include="ServiceLocator.cs" />
-    <Compile Include="TaskController.cs" />
     <Compile Include="ProgressInitEventArgs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Parallels\AsyncPool.cs" />
@@ -144,11 +140,7 @@
     <Compile Include="Diagnostics\LogEventArgs.cs" />
     <Compile Include="Diagnostics\LogEventArgsT.cs" />
     <Compile Include="Diagnostics\Extensions.cs" />
-    <Compile Include="IComponentContainer.cs" />
     <Compile Include="PromiseEventType.cs" />
-    <Compile Include="ComponentContainer.cs" />
-    <Compile Include="DisposablePool.cs" />
-    <Compile Include="ObjectPool.cs" />
     <Compile Include="Parallels\AsyncQueue.cs" />
     <Compile Include="PromiseT.cs" />
     <Compile Include="IDeferred.cs" />
@@ -180,6 +172,16 @@
     <Compile Include="SuccessPromiseT.cs" />
     <Compile Include="PromiseAwaiterT.cs" />
     <Compile Include="PromiseAwaiter.cs" />
+    <Compile Include="Components\ComponentContainer.cs" />
+    <Compile Include="Components\Disposable.cs" />
+    <Compile Include="Components\DisposablePool.cs" />
+    <Compile Include="Components\ObjectPool.cs" />
+    <Compile Include="Components\ServiceLocator.cs" />
+    <Compile Include="Components\IInitializable.cs" />
+    <Compile Include="TaskController.cs" />
+    <Compile Include="Components\App.cs" />
+    <Compile Include="Components\IRunnable.cs" />
+    <Compile Include="Components\ExecutionState.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup />
@@ -252,4 +254,7 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
+  <ItemGroup>
+    <Folder Include="Components\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file