diff --git a/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj b/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj
index 0369ea23..8bb5fe92 100644
--- a/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj
+++ b/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj
@@ -22,6 +22,8 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -260,8 +262,7 @@
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != '' And '$(VCModulesOutputDir)' == ''" />
-  <Import Project="$(SolutionDir)\targets\VirtoCommerce.Module.targets" Condition="'$(VCModulesOutputDir)' != ''" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
   <ProjectExtensions>
     <VisualStudio>
@@ -272,6 +273,13 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="..\packages\VirtoCommerce.Module.0.2.0\build\VirtoCommerce.Module.targets" Condition="Exists('..\packages\VirtoCommerce.Module.0.2.0\build\VirtoCommerce.Module.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\VirtoCommerce.Module.0.2.0\build\VirtoCommerce.Module.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\VirtoCommerce.Module.0.2.0\build\VirtoCommerce.Module.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/VirtoCommerce.OrderModule.Web/module.manifest b/VirtoCommerce.OrderModule.Web/module.manifest
index 5d1bc73b..4373d6b2 100644
--- a/VirtoCommerce.OrderModule.Web/module.manifest
+++ b/VirtoCommerce.OrderModule.Web/module.manifest
@@ -1,124 +1,124 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <module>
-	<id>VirtoCommerce.Orders</id>
-	<version>2.10.0</version>
-	<platformVersion>2.10.0</platformVersion>
-	<dependencies>
-		<dependency id="VirtoCommerce.Core" version="2.10.0" />
+    <id>VirtoCommerce.Orders</id>
+    <version>2.10.0</version>
+    <platformVersion>2.10.0</platformVersion>
+    <dependencies>
+        <dependency id="VirtoCommerce.Core" version="2.10.0" />
         <dependency id="VirtoCommerce.Catalog" version="2.10.0" />
         <dependency id="VirtoCommerce.Pricing" version="2.10.0" />
     </dependencies>
 
-	<title>Order module</title>
-	<description>Document based flexible orders management functionality</description>
-	<authors>
-		<author>Virto Commerce</author>
-	</authors>
-	<owners>
-		<owner>Virto Commerce</owner>
-	</owners>
-	<projectUrl>http://virtocommerce.com/</projectUrl>
-	<iconUrl>Modules/$(VirtoCommerce.Orders)/Content/logo.png</iconUrl>
-	<releaseNotes>First version.</releaseNotes>
-	<copyright>Copyright © 2011-2015 Virto Commerce. All rights reserved</copyright>
-	<tags>order system</tags>
+    <title>Order module</title>
+    <description>Document based flexible orders management functionality</description>
+    <authors>
+        <author>Virto Commerce</author>
+    </authors>
+    <owners>
+        <owner>Virto Commerce</owner>
+    </owners>
+    <projectUrl>http://virtocommerce.com/</projectUrl>
+    <iconUrl>Modules/$(VirtoCommerce.Orders)/Content/logo.png</iconUrl>
+    <releaseNotes>First version.</releaseNotes>
+    <copyright>Copyright © 2011-2015 Virto Commerce. All rights reserved</copyright>
+    <tags>order system</tags>
 
-	<assemblyFile>VirtoCommerce.OrderModule.Web.dll</assemblyFile>
-	<moduleType>VirtoCommerce.OrderModule.Web.Module, VirtoCommerce.OrderModule.Web</moduleType>
-	<styles>
-		<directory virtualPath="$/Content/css" searchPattern="*.css" searchSubdirectories="true" />
-	</styles>
-	<scripts>
-		<directory virtualPath="$/Scripts" searchPattern="*.js" searchSubdirectories="true" />
-	</scripts>
+    <assemblyFile>VirtoCommerce.OrderModule.Web.dll</assemblyFile>
+    <moduleType>VirtoCommerce.OrderModule.Web.Module, VirtoCommerce.OrderModule.Web</moduleType>
+    <styles>
+        <directory virtualPath="$/Content/css" searchPattern="*.css" searchSubdirectories="true" />
+    </styles>
+    <scripts>
+        <directory virtualPath="$/Scripts" searchPattern="*.js" searchSubdirectories="true" />
+    </scripts>
 
-	<settings>
-		<group name="Orders|General">
-			<setting>
-				<name>Order.Status</name>
-				<valueType>string</valueType>
-				<defaultValue>New</defaultValue>
-				<title>Customer order statuses</title>
-				<description>Customer order statuses</description>
-				<isArray>true</isArray>
-				<arrayValues>
-					<value>New</value>
-					<value>Processing</value>
-					<value>Cancelled</value>
-					<value>Completed</value>
-				</arrayValues>
-			</setting>
-			<setting>
-				<name>Shipment.Status</name>
-				<valueType>string</valueType>
-				<defaultValue>New</defaultValue>
-				<title>Shipment statuses</title>
-				<description>Shipment statuses</description>
-				<isArray>true</isArray>
-				<arrayValues>
-					<value>New</value>
-					<value>PickPack</value>
-					<value>Cancelled</value>
-					<value>ReadyToSend</value>
-					<value>Send</value>
-				</arrayValues>
-			</setting>
-			<setting>
-				<name>PaymentIn.Status</name>
-				<valueType>string</valueType>
-				<defaultValue>New</defaultValue>
-				<title>Payment statuses</title>
-				<description>Incoming payment statuses</description>
-				<isArray>true</isArray>
-				<arrayValues>
-					<value>New</value>
-					<value>Pending</value>
-					<value>Authorized</value>
-					<value>Paid</value>
-					<value>PartiallyRefunded</value>
-					<value>Refunded</value>
-					<value>Voided</value>
-					<value>Custom</value>
-					<value>Cancelled</value>
-				</arrayValues>
-			</setting>
-			<setting>
-				<name>Order.CustomerOrderNewNumberTemplate</name>
-				<valueType>string</valueType>
-				<defaultValue>CO{0:yyMMdd}-{1:D5}</defaultValue>
-				<title>Order number template</title>
-				<description>The template (pattern) that will be used to generate the number for new Customer Order. Parameters: 0 - date (the UTC time of number generation); 1 - the sequence number.</description>
-			</setting>
-			<setting>
-				<name>Order.ShipmentNewNumberTemplate</name>
-				<valueType>string</valueType>
-				<defaultValue>SH{0:yyMMdd}-{1:D5}</defaultValue>
-				<title>Order shipment number template</title>
-				<description>The template (pattern) that will be used to generate the number for new Shipment. Parameters: 0 - date (the UTC time of number generation); 1 - the sequence number.</description>
-			</setting>
-			<setting>
-				<name>Order.PaymentInNewNumberTemplate</name>
-				<valueType>string</valueType>
-				<defaultValue>PI{0:yyMMdd}-{1:D5}</defaultValue>
-				<title>Order payment number template</title>
-				<description>The template (pattern) that will be used to generate the number for new incoming Payment. Parameters: 0 - date (the UTC time of number generation); 1 - the sequence number.</description>
-			</setting>
-			<setting>
-				<name>Order.ExportImport.Description</name>
-				<valueType>string</valueType>
-				<defaultValue>Export/Import customer orders with all related objects (line items, shipments, payments etc)</defaultValue>
-				<title>Export/Import description</title>
-				<description>Module description in platform export/import wizard</description>
-			</setting>
-		</group>
-	</settings>
-	<permissions>
-		<group name="Order">
-			<permission id="order:access" name="Open orders menu" description="Permission to open orders menu."/>
-			<permission id="order:create" name="Create order data" description="Permission to create order data."/>
-			<permission id="order:read" name="View order data" description="Permission to browse and view order data."/>
-			<permission id="order:update" name="Update order data" description="Permission to update order data."/>
-			<permission id="order:delete" name="Delete order" description="Permission to delete orders."/>
-		</group>
-	</permissions>
+    <settings>
+        <group name="Orders|General">
+            <setting>
+                <name>Order.Status</name>
+                <valueType>string</valueType>
+                <defaultValue>New</defaultValue>
+                <title>Customer order statuses</title>
+                <description>Customer order statuses</description>
+                <isArray>true</isArray>
+                <arrayValues>
+                    <value>New</value>
+                    <value>Processing</value>
+                    <value>Cancelled</value>
+                    <value>Completed</value>
+                </arrayValues>
+            </setting>
+            <setting>
+                <name>Shipment.Status</name>
+                <valueType>string</valueType>
+                <defaultValue>New</defaultValue>
+                <title>Shipment statuses</title>
+                <description>Shipment statuses</description>
+                <isArray>true</isArray>
+                <arrayValues>
+                    <value>New</value>
+                    <value>PickPack</value>
+                    <value>Cancelled</value>
+                    <value>ReadyToSend</value>
+                    <value>Send</value>
+                </arrayValues>
+            </setting>
+            <setting>
+                <name>PaymentIn.Status</name>
+                <valueType>string</valueType>
+                <defaultValue>New</defaultValue>
+                <title>Payment statuses</title>
+                <description>Incoming payment statuses</description>
+                <isArray>true</isArray>
+                <arrayValues>
+                    <value>New</value>
+                    <value>Pending</value>
+                    <value>Authorized</value>
+                    <value>Paid</value>
+                    <value>PartiallyRefunded</value>
+                    <value>Refunded</value>
+                    <value>Voided</value>
+                    <value>Custom</value>
+                    <value>Cancelled</value>
+                </arrayValues>
+            </setting>
+            <setting>
+                <name>Order.CustomerOrderNewNumberTemplate</name>
+                <valueType>string</valueType>
+                <defaultValue>CO{0:yyMMdd}-{1:D5}</defaultValue>
+                <title>Order number template</title>
+                <description>The template (pattern) that will be used to generate the number for new Customer Order. Parameters: 0 - date (the UTC time of number generation); 1 - the sequence number.</description>
+            </setting>
+            <setting>
+                <name>Order.ShipmentNewNumberTemplate</name>
+                <valueType>string</valueType>
+                <defaultValue>SH{0:yyMMdd}-{1:D5}</defaultValue>
+                <title>Order shipment number template</title>
+                <description>The template (pattern) that will be used to generate the number for new Shipment. Parameters: 0 - date (the UTC time of number generation); 1 - the sequence number.</description>
+            </setting>
+            <setting>
+                <name>Order.PaymentInNewNumberTemplate</name>
+                <valueType>string</valueType>
+                <defaultValue>PI{0:yyMMdd}-{1:D5}</defaultValue>
+                <title>Order payment number template</title>
+                <description>The template (pattern) that will be used to generate the number for new incoming Payment. Parameters: 0 - date (the UTC time of number generation); 1 - the sequence number.</description>
+            </setting>
+            <setting>
+                <name>Order.ExportImport.Description</name>
+                <valueType>string</valueType>
+                <defaultValue>Export/Import customer orders with all related objects (line items, shipments, payments etc)</defaultValue>
+                <title>Export/Import description</title>
+                <description>Module description in platform export/import wizard</description>
+            </setting>
+        </group>
+    </settings>
+    <permissions>
+        <group name="Order">
+            <permission id="order:access" name="Open orders menu" description="Permission to open orders menu."/>
+            <permission id="order:create" name="Create order data" description="Permission to create order data."/>
+            <permission id="order:read" name="View order data" description="Permission to browse and view order data."/>
+            <permission id="order:update" name="Update order data" description="Permission to update order data."/>
+            <permission id="order:delete" name="Delete order" description="Permission to delete orders."/>
+        </group>
+    </permissions>
 </module>
diff --git a/VirtoCommerce.OrderModule.Web/packages.config b/VirtoCommerce.OrderModule.Web/packages.config
index 5c895cac..2c4e38d7 100644
--- a/VirtoCommerce.OrderModule.Web/packages.config
+++ b/VirtoCommerce.OrderModule.Web/packages.config
@@ -12,6 +12,7 @@
   <package id="valueinjecter" version="2.3.3" targetFramework="net451" />
   <package id="VirtoCommerce.CoreModule.Data" version="2.10.1" targetFramework="net451" />
   <package id="VirtoCommerce.Domain" version="2.10.1" targetFramework="net451" />
+  <package id="VirtoCommerce.Module" version="0.2.0" targetFramework="net451" developmentDependency="true" />
   <package id="VirtoCommerce.Platform.Core" version="2.10.1" targetFramework="net451" />
   <package id="VirtoCommerce.Platform.Core.Web" version="2.10.1" targetFramework="net451" />
   <package id="VirtoCommerce.Platform.Data" version="2.10.1" targetFramework="net451" />