--- a/Implab/Implab.csproj	Fri Feb 19 18:07:17 2016 +0300
+++ b/Implab/Implab.csproj	Fri Apr 22 13:08:08 2016 +0300
@@ -8,6 +8,9 @@
     <RootNamespace>Implab</RootNamespace>
     <AssemblyName>Implab</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <ReleaseVersion>0.2</ReleaseVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -88,40 +91,10 @@
     <Compile Include="IPromise.cs" />
     <Compile Include="IServiceLocator.cs" />
     <Compile Include="ITaskController.cs" />
-    <Compile Include="JSON\JSONElementContext.cs" />
-    <Compile Include="JSON\JSONElementType.cs" />
-    <Compile Include="JSON\JSONGrammar.cs" />
-    <Compile Include="JSON\JSONParser.cs" />
-    <Compile Include="JSON\JSONScanner.cs" />
-    <Compile Include="JSON\JsonTokenType.cs" />
-    <Compile Include="JSON\JSONWriter.cs" />
-    <Compile Include="JSON\JSONXmlReader.cs" />
-    <Compile Include="JSON\JSONXmlReaderOptions.cs" />
-    <Compile Include="JSON\StringTranslator.cs" />
     <Compile Include="Parallels\DispatchPool.cs" />
     <Compile Include="Parallels\ArrayTraits.cs" />
     <Compile Include="Parallels\MTQueue.cs" />
     <Compile Include="Parallels\WorkerPool.cs" />
-    <Compile Include="Parsing\AltToken.cs" />
-    <Compile Include="Parsing\BinaryToken.cs" />
-    <Compile Include="Parsing\CatToken.cs" />
-    <Compile Include="Parsing\CDFADefinition.cs" />
-    <Compile Include="Parsing\DFABuilder.cs" />
-    <Compile Include="Parsing\DFAStateDescriptor.cs" />
-    <Compile Include="Parsing\DFAutomaton.cs" />
-    <Compile Include="Parsing\EDFADefinition.cs" />
-    <Compile Include="Parsing\EmptyToken.cs" />
-    <Compile Include="Parsing\EndToken.cs" />
-    <Compile Include="Parsing\EnumAlphabet.cs" />
-    <Compile Include="Parsing\Grammar.cs" />
-    <Compile Include="Parsing\IAlphabet.cs" />
-    <Compile Include="Parsing\IDFADefinition.cs" />
-    <Compile Include="Parsing\IVisitor.cs" />
-    <Compile Include="Parsing\ParserException.cs" />
-    <Compile Include="Parsing\Scanner.cs" />
-    <Compile Include="Parsing\StarToken.cs" />
-    <Compile Include="Parsing\SymbolToken.cs" />
-    <Compile Include="Parsing\Token.cs" />
     <Compile Include="ProgressInitEventArgs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Parallels\AsyncPool.cs" />
@@ -178,11 +151,50 @@
     <Compile Include="Components\ExecutionState.cs" />
     <Compile Include="Components\RunnableComponent.cs" />
     <Compile Include="Components\IFactory.cs" />
-    <Compile Include="Parsing\DFADefinition.cs" />
-    <Compile Include="Parsing\IndexedAlphabetBase.cs" />
-    <Compile Include="Parsing\CharAlphabet.cs" />
-    <Compile Include="Parsing\IAlphabetBuilder.cs" />
-    <Compile Include="Parsing\IDFADefinitionBuilder.cs" />
+    <Compile Include="Automaton\IAlphabet.cs" />
+    <Compile Include="Automaton\ParserException.cs" />
+    <Compile Include="Automaton\IndexedAlphabetBase.cs" />
+    <Compile Include="Automaton\IAlphabetBuilder.cs" />
+    <Compile Include="Automaton\RegularExpressions\AltToken.cs" />
+    <Compile Include="Automaton\RegularExpressions\BinaryToken.cs" />
+    <Compile Include="Automaton\RegularExpressions\CatToken.cs" />
+    <Compile Include="Automaton\RegularExpressions\StarToken.cs" />
+    <Compile Include="Automaton\RegularExpressions\SymbolToken.cs" />
+    <Compile Include="Automaton\RegularExpressions\EmptyToken.cs" />
+    <Compile Include="Automaton\RegularExpressions\Token.cs" />
+    <Compile Include="Automaton\RegularExpressions\IVisitor.cs" />
+    <Compile Include="Automaton\AutomatonTransition.cs" />
+    <Compile Include="Formats\JSON\JSONElementContext.cs" />
+    <Compile Include="Formats\JSON\JSONElementType.cs" />
+    <Compile Include="Formats\JSON\JSONGrammar.cs" />
+    <Compile Include="Formats\JSON\JSONParser.cs" />
+    <Compile Include="Formats\JSON\JSONScanner.cs" />
+    <Compile Include="Formats\JSON\JsonTokenType.cs" />
+    <Compile Include="Formats\JSON\JSONWriter.cs" />
+    <Compile Include="Formats\JSON\JSONXmlReader.cs" />
+    <Compile Include="Formats\JSON\JSONXmlReaderOptions.cs" />
+    <Compile Include="Formats\JSON\StringTranslator.cs" />
+    <Compile Include="Automaton\MapAlphabet.cs" />
+    <Compile Include="Formats\CharAlphabet.cs" />
+    <Compile Include="Formats\ByteAlphabet.cs" />
+    <Compile Include="Automaton\IDFATable.cs" />
+    <Compile Include="Automaton\IDFATableBuilder.cs" />
+    <Compile Include="Automaton\DFATable.cs" />
+    <Compile Include="Automaton\RegularExpressions\RegularExpressionVisitor.cs" />
+    <Compile Include="Automaton\RegularExpressions\ITaggedDFABuilder.cs" />
+    <Compile Include="Formats\TextScanner.cs" />
+    <Compile Include="Formats\StringScanner.cs" />
+    <Compile Include="Formats\ReaderScanner.cs" />
+    <Compile Include="Formats\ScannerContext.cs" />
+    <Compile Include="Formats\Grammar.cs" />
+    <Compile Include="Automaton\RegularExpressions\EndTokenT.cs" />
+    <Compile Include="Automaton\RegularExpressions\EndToken.cs" />
+    <Compile Include="Automaton\RegularExpressions\RegularExpressionVisitorT.cs" />
+    <Compile Include="Automaton\AutomatonConst.cs" />
+    <Compile Include="Automaton\RegularExpressions\RegularDFA.cs" />
+    <Compile Include="Components\LazyAndWeak.cs" />
+    <Compile Include="AbstractTask.cs" />
+    <Compile Include="AbstractTaskT.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup />
@@ -257,5 +269,8 @@
   </ProjectExtensions>
   <ItemGroup>
     <Folder Include="Components\" />
+    <Folder Include="Automaton\RegularExpressions\" />
+    <Folder Include="Formats\" />
+    <Folder Include="Formats\JSON\" />
   </ItemGroup>
 </Project>
\ No newline at end of file