diff --git a/composer.json b/composer.json
index fb70c6bde..85a3f9237 100755
--- a/composer.json
+++ b/composer.json
@@ -98,7 +98,7 @@
             "Webkul\\CustomerCreditMax\\": "packages/Webkul/CustomerCreditMax",
             "Webkul\\CustomerGroupCatalog\\": "packages/Webkul/CustomerGroupCatalog",
             "Webkul\\ShowPriceAfterLogin\\": "packages/Webkul/ShowPriceAfterLogin/src",
-            "Webkul\\SAASPreOrder\\": "packages/Webkul/SAASPreOrder/src"
+            "Webkul\\PreOrder\\": "packages/Webkul/PreOrder/src"
         }
     },
     "autoload-dev": {
diff --git a/config/app.php b/config/app.php
index 6a6214c1b..df5314d95 100755
--- a/config/app.php
+++ b/config/app.php
@@ -251,7 +251,7 @@ return [
         Webkul\StripeConnect\Providers\StripeConnectServiceProvider::class,
         Webkul\ShowPriceAfterLogin\Providers\ShowPriceAfterLoginServiceProvider::class,
         Webkul\CustomerCreditMax\Providers\CustomerCreditMaxServiceProvider::class,
-        Webkul\SAASPreOrder\Providers\SAASPreOrderServiceProvider::class,
+        Webkul\PreOrder\Providers\PreOrderServiceProvider::class,
         Webkul\SAASCustomizer\Providers\SAASCustomizerServiceProvider::class,
         Webkul\CustomerGroupCatalog\Providers\CustomerGroupCatalogServiceProvider::class
     ],
diff --git a/config/concord.php b/config/concord.php
index ca5225c63..fa3d1cff0 100755
--- a/config/concord.php
+++ b/config/concord.php
@@ -21,6 +21,6 @@ return [
         \Webkul\User\Providers\ModuleServiceProvider::class,
         \Webkul\Discount\Providers\ModuleServiceProvider::class,
         \Webkul\StripeConnect\Providers\ModuleServiceProvider::class,
-        \Webkul\SAASPreOrder\Providers\ModuleServiceProvider::class
+        \Webkul\PreOrder\Providers\ModuleServiceProvider::class
     ]
 ];
\ No newline at end of file
diff --git a/packages/Webkul/CustomerDocument/src/Config/menu.php b/packages/Webkul/CustomerDocument/src/Config/menu.php
index 9eacd453a..9a6965f95 100644
--- a/packages/Webkul/CustomerDocument/src/Config/menu.php
+++ b/packages/Webkul/CustomerDocument/src/Config/menu.php
@@ -6,7 +6,7 @@ return [
         'name' => 'customerdocument::app.admin.customers.documents',
         'route' => 'admin.documents.index',
         'sort' => 6,
-        'icon-class' => 'document-icon',
+        'icon-class' => 'sales-icon',
     ], [
         'key' => 'documents.files',
         'name' => 'customerdocument::app.admin.documents.b2b-files',
diff --git a/packages/Webkul/CustomerDocument/src/Database/migrations/2019_06_07_122059_customer_documents_table.php b/packages/Webkul/CustomerDocument/src/Database/migrations/2019_06_07_122059_customer_documents_table.php
index 2a8b61f42..f46e7fd0c 100644
--- a/packages/Webkul/CustomerDocument/src/Database/migrations/2019_06_07_122059_customer_documents_table.php
+++ b/packages/Webkul/CustomerDocument/src/Database/migrations/2019_06_07_122059_customer_documents_table.php
@@ -21,8 +21,6 @@ class CustomerDocumentsTable extends Migration
             $table->string('type');
             $table->string('path');
             $table->integer('customer_id')->default(0);
-            $table->integer('company_id')->unsigned();
-            $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
             $table->timestamps();
         });
     }
diff --git a/packages/Webkul/CustomerDocument/src/Models/CustomerDocument.php b/packages/Webkul/CustomerDocument/src/Models/CustomerDocument.php
index fcaabad73..f31502d1d 100644
--- a/packages/Webkul/CustomerDocument/src/Models/CustomerDocument.php
+++ b/packages/Webkul/CustomerDocument/src/Models/CustomerDocument.php
@@ -4,28 +4,10 @@ namespace Webkul\CustomerDocument\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Webkul\CustomerDocument\Contracts\CustomerDocument as CustomerDocumentContract;
-use Company;
 
 class CustomerDocument extends Model implements CustomerDocumentContract
 {
     protected $table = 'customer_documents';
 
-    protected $fillable = ['name', 'path', 'customer_id', 'description', 'type', 'status', 'company_id'];
-
-    /**
-     * Create a new Eloquent query builder for the model.
-     *
-     * @param  \Illuminate\Database\Query\Builder  $query
-     * @return \Illuminate\Database\Eloquent\Builder|static
-     */
-    public function newEloquentBuilder($query)
-    {
-        $company = Company::getCurrent();
-
-        if (auth()->guard('super-admin')->check() || ! isset($company->id)) {
-            return new \Illuminate\Database\Eloquent\Builder($query);
-        } else {
-            return new \Illuminate\Database\Eloquent\Builder($query->where('customer_documents' . '.company_id', $company->id));
-        }
-    }
+    protected $fillable = ['name', 'path', 'customer_id', 'description', 'type', 'status'];
 }
\ No newline at end of file
diff --git a/packages/Webkul/CustomerDocument/src/Resources/views/admin/customers/upload.blade.php b/packages/Webkul/CustomerDocument/src/Resources/views/admin/customers/upload.blade.php
index 0b7df0f22..d05efefa6 100644
--- a/packages/Webkul/CustomerDocument/src/Resources/views/admin/customers/upload.blade.php
+++ b/packages/Webkul/CustomerDocument/src/Resources/views/admin/customers/upload.blade.php
@@ -11,7 +11,7 @@ $documents = $customerDocumentRepository->findWhere(['customer_id' => $customer-
 
     <style>
         .modal-container {
-        top: 20px !important;
+            top: 20px !important;
         }
     </style>
 @stop
@@ -71,7 +71,7 @@ $documents = $customerDocumentRepository->findWhere(['customer_id' => $customer-
 
             <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
                 <label for="name" class="required">{{ __('customerdocument::app.admin.customers.name') }}</label>
-                <input v-validate="'required|alpha_spaces'" type="text" class="control" id="name" name="name" data-vv-as="&quot;{{ __('customerdocument::app.admin.customers.name') }}&quot;" value="{{ old('name') }}" />
+                <input v-validate="'required'" type="text" class="control" id="name" name="name" data-vv-as="&quot;{{ __('customerdocument::app.admin.customers.name') }}&quot;" value="{{ old('name') }}"/>
                 <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
             </div>
 
diff --git a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/create.blade.php b/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/create.blade.php
index 6e085a881..9303f0b27 100644
--- a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/create.blade.php
+++ b/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/create.blade.php
@@ -31,7 +31,7 @@
 
                     <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
                         <label for="name" class="required">{{ __('customerdocument::app.admin.customers.name') }}</label>
-                        <input v-validate="'required|alpha_spaces'" type="text" class="control" id="name" name="name" data-vv-as="&quot;{{ __('customerdocument::app.admin.customers.name') }}&quot;" value="{{ old('name') }}"/>
+                        <input v-validate="'required'" type="text" class="control" id="name" name="name" data-vv-as="&quot;{{ __('customerdocument::app.admin.customers.name') }}&quot;" value="{{ old('name') }}"/>
                         <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
                     </div>
 
diff --git a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/edit.blade.php b/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/edit.blade.php
index 6bea611b3..4932623bb 100644
--- a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/edit.blade.php
+++ b/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/edit.blade.php
@@ -33,7 +33,7 @@
 
                     <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
                         <label for="name" class="required">{{ __('customerdocument::app.admin.customers.name') }}</label>
-                        <input v-validate="'required|alpha_spaces'" type="text" class="control" id="name" name="name" value="{{ $document->name }}" data-vv-as="&quot;{{ __('customerdocument::app.admin.customers.name') }}&quot;"/>
+                        <input v-validate="'required'" type="text" class="control" id="name" name="name" value="{{ $document->name }}" data-vv-as="&quot;{{ __('customerdocument::app.admin.customers.name') }}&quot;"/>
                         <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
                     </div>
 
@@ -100,4 +100,4 @@
         </form>
     </div>
 
-@stop
+@stop
\ No newline at end of file
diff --git a/packages/Webkul/CustomerDocument/src/Resources/views/shop/customers/document.blade.php b/packages/Webkul/CustomerDocument/src/Resources/views/shop/customers/document.blade.php
index c5a9e3de5..3f33c97aa 100644
--- a/packages/Webkul/CustomerDocument/src/Resources/views/shop/customers/document.blade.php
+++ b/packages/Webkul/CustomerDocument/src/Resources/views/shop/customers/document.blade.php
@@ -114,4 +114,4 @@
     });
 </script>
 
-@endpush
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/CustomerGroupCatalog/src/Models/CustomerGroup.php b/packages/Webkul/CustomerGroupCatalog/src/Models/CustomerGroup.php
index 8b40475ab..08e59b146 100644
--- a/packages/Webkul/CustomerGroupCatalog/src/Models/CustomerGroup.php
+++ b/packages/Webkul/CustomerGroupCatalog/src/Models/CustomerGroup.php
@@ -2,7 +2,7 @@
 namespace Webkul\CustomerGroupCatalog\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Webkul\SAASCustomizer\Models\Customer\CustomerGroup as BaseCustomerGroup;
+use Webkul\Customer\Models\CustomerGroup as BaseCustomerGroup;
 use Webkul\Product\Models\ProductProxy;
 use Webkul\Category\Models\CategoryProxy;
 
diff --git a/packages/Webkul/CustomerGroupCatalog/src/Repositories/CategoryRepository.php b/packages/Webkul/CustomerGroupCatalog/src/Repositories/CategoryRepository.php
index 8862358ef..dbd9e3283 100644
--- a/packages/Webkul/CustomerGroupCatalog/src/Repositories/CategoryRepository.php
+++ b/packages/Webkul/CustomerGroupCatalog/src/Repositories/CategoryRepository.php
@@ -23,7 +23,6 @@ class CategoryRepository extends BaseCategoryRepository
         return $this->getModel()->join('category_translations', function ($join) {
                 $join->on('categories.id', 'category_translations.category_id')
                     ->where('category_translations.locale', app()->getLocale())
-                    ->where('categories.parent_id', '!=', null)
                     ->where('category_translations.name', 'like', '%' . urldecode(request()->input('query')) . '%');
             })
             ->select('categories.*')
@@ -55,44 +54,14 @@ class CategoryRepository extends BaseCategoryRepository
 
             $categoryIds = app('Webkul\CustomerGroupCatalog\Repositories\CustomerGroupRepository')->findOneByField('code', 'guest')->categories()->pluck('id')->toArray();
 
-            foreach ($categories as $category) {
-                $parentCategoryIds[] = $category->id;
-                $parentCategory = $this->getParentCategory($category->parent_id);
-
-                $result = array_merge($parentCategoryIds, $parentCategory);
-                $count = 0;
-                foreach($result as $cat) {
-                    if (in_array($cat, $categoryIds)) {
-                        $count++;
-                    }
-                }
-
-                if (count($result) == $count) {
-                    $showCategories[] = $category->id;
-                }
-            }
+            $showCategories = $this->getShowAbleCatyegory($categories, $categoryIds);
         } else {
             if ($customer->group) {
                 $categories = app('Webkul\CustomerGroupCatalog\Repositories\CustomerGroupRepository')->find($customer->group->id)->categories()->get();
 
                 $categoryIds = app('Webkul\CustomerGroupCatalog\Repositories\CustomerGroupRepository')->find($customer->group->id)->categories()->pluck('id')->toArray();
 
-                foreach ($categories as $category) {
-                    $parentCategoryIds[] = $category->id;
-                    $parentCategory = $this->getParentCategory($category->parent_id);
-
-                    $result = array_merge($parentCategoryIds, $parentCategory);
-                    $count = 0;
-                    foreach($result as $cat) {
-                        if (in_array($cat, $categoryIds)) {
-                            $count++;
-                        }
-                    }
-
-                    if (count($result) == $count) {
-                        $showCategories[] = $category->id;
-                    }
-                }
+                $showCategories = $this->getShowAbleCatyegory($categories, $categoryIds);
             }
         }
 
@@ -111,6 +80,35 @@ class CategoryRepository extends BaseCategoryRepository
         }
     }
 
+    /**
+     * get show able category
+     *
+     * @param integer array
+     * @return array
+     */
+    public function getShowAbleCatyegory($categories, $categoryIds) {
+        $showCategories = [];
+
+        foreach ($categories as $category) {
+            $parentCategoryIds[] = $category->id;
+            $parentCategory = $this->getParentCategory($category->parent_id);
+
+            $result = array_merge($parentCategoryIds, $parentCategory);
+            $count = 0;
+            foreach($result as $cat) {
+                if (in_array($cat, $categoryIds)) {
+                    $count++;
+                }
+            }
+
+            if (count($result) == $count) {
+                $showCategories[] = $category->id;
+            }
+        }
+
+        return $showCategories;
+    }
+
     /**
      * get parent category
      *
@@ -122,7 +120,7 @@ class CategoryRepository extends BaseCategoryRepository
         $parentCategory = $this->getModel()->where('id', $parentId)->first();
 
         if ($parentCategory->parent_id != null) {
-            $parentCategories[] = $parentCategory->id;
+            $parentCategories[] = array_push($parentCategories, $parentCategory->id);
             $this->getParentCategory($parentCategory->parent_id);
         }
 
diff --git a/packages/Webkul/SAASPreOrder/package.json b/packages/Webkul/PreOrder/package.json
similarity index 100%
rename from packages/Webkul/SAASPreOrder/package.json
rename to packages/Webkul/PreOrder/package.json
diff --git a/packages/Webkul/SAASPreOrder/publishable/assets/css/preorder-admin.css b/packages/Webkul/PreOrder/publishable/assets/css/preorder-admin.css
similarity index 100%
rename from packages/Webkul/SAASPreOrder/publishable/assets/css/preorder-admin.css
rename to packages/Webkul/PreOrder/publishable/assets/css/preorder-admin.css
diff --git a/packages/Webkul/SAASPreOrder/publishable/assets/css/preorder.css b/packages/Webkul/PreOrder/publishable/assets/css/preorder.css
similarity index 100%
rename from packages/Webkul/SAASPreOrder/publishable/assets/css/preorder.css
rename to packages/Webkul/PreOrder/publishable/assets/css/preorder.css
diff --git a/packages/Webkul/SAASPreOrder/publishable/assets/images/Icon-Preorder-Active.svg b/packages/Webkul/PreOrder/publishable/assets/images/Icon-Preorder-Active.svg
similarity index 100%
rename from packages/Webkul/SAASPreOrder/publishable/assets/images/Icon-Preorder-Active.svg
rename to packages/Webkul/PreOrder/publishable/assets/images/Icon-Preorder-Active.svg
diff --git a/packages/Webkul/SAASPreOrder/publishable/assets/images/Icon-Preorder.svg b/packages/Webkul/PreOrder/publishable/assets/images/Icon-Preorder.svg
similarity index 100%
rename from packages/Webkul/SAASPreOrder/publishable/assets/images/Icon-Preorder.svg
rename to packages/Webkul/PreOrder/publishable/assets/images/Icon-Preorder.svg
diff --git a/packages/Webkul/SAASPreOrder/publishable/assets/mix-manifest.json b/packages/Webkul/PreOrder/publishable/assets/mix-manifest.json
similarity index 100%
rename from packages/Webkul/SAASPreOrder/publishable/assets/mix-manifest.json
rename to packages/Webkul/PreOrder/publishable/assets/mix-manifest.json
diff --git a/packages/Webkul/SAASPreOrder/src/Commands/Console/GenerateData.php b/packages/Webkul/PreOrder/src/Commands/Console/GenerateData.php
similarity index 98%
rename from packages/Webkul/SAASPreOrder/src/Commands/Console/GenerateData.php
rename to packages/Webkul/PreOrder/src/Commands/Console/GenerateData.php
index 9497eb9d2..f9c60b792 100644
--- a/packages/Webkul/SAASPreOrder/src/Commands/Console/GenerateData.php
+++ b/packages/Webkul/PreOrder/src/Commands/Console/GenerateData.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Commands\Console;
+namespace Webkul\PreOrder\Commands\Console;
 
 use Illuminate\Console\Command;
 
@@ -10,7 +10,7 @@ use Webkul\Attribute\Repositories\AttributeFamilyRepository;
 use Validator;
 
 /**
- * SAASPreOrderSeeder
+ * PreOrderSeeder
  *
  * @author  Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
  * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
diff --git a/packages/Webkul/SAASPreOrder/src/Config/acl.php b/packages/Webkul/PreOrder/src/Config/acl.php
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Config/acl.php
rename to packages/Webkul/PreOrder/src/Config/acl.php
diff --git a/packages/Webkul/SAASPreOrder/src/Config/admin-menu.php b/packages/Webkul/PreOrder/src/Config/admin-menu.php
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Config/admin-menu.php
rename to packages/Webkul/PreOrder/src/Config/admin-menu.php
diff --git a/packages/Webkul/PreOrder/src/Config/purge-pool.php b/packages/Webkul/PreOrder/src/Config/purge-pool.php
new file mode 100644
index 000000000..f4626a1f2
--- /dev/null
+++ b/packages/Webkul/PreOrder/src/Config/purge-pool.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'preorderseeder' => 'Webkul\PreOrder\Helpers\PreOrderDataPurger'
+];
\ No newline at end of file
diff --git a/packages/Webkul/SAASPreOrder/src/Config/system.php b/packages/Webkul/PreOrder/src/Config/system.php
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Config/system.php
rename to packages/Webkul/PreOrder/src/Config/system.php
diff --git a/packages/Webkul/PreOrder/src/Contracts/PreOrderItem.php b/packages/Webkul/PreOrder/src/Contracts/PreOrderItem.php
new file mode 100644
index 000000000..85c9f7289
--- /dev/null
+++ b/packages/Webkul/PreOrder/src/Contracts/PreOrderItem.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Webkul\PreOrder\Contracts;
+
+interface PreOrderItem
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/SAASPreOrder/src/DataGrids/Admin/Order.php b/packages/Webkul/PreOrder/src/DataGrids/Admin/Order.php
similarity index 97%
rename from packages/Webkul/SAASPreOrder/src/DataGrids/Admin/Order.php
rename to packages/Webkul/PreOrder/src/DataGrids/Admin/Order.php
index 8728fe590..272304438 100644
--- a/packages/Webkul/SAASPreOrder/src/DataGrids/Admin/Order.php
+++ b/packages/Webkul/PreOrder/src/DataGrids/Admin/Order.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\DataGrids\Admin;
+namespace Webkul\PreOrder\DataGrids\Admin;
 
 use Webkul\Ui\DataGrid\DataGrid;
 use DB;
@@ -39,7 +39,6 @@ class Order extends DataGrid
 
         $this->addFilter('billed_to', DB::raw('CONCAT(order_address_billing.first_name, " ", order_address_billing.last_name)'));
         $this->addFilter('shipped_to', DB::raw('CONCAT(order_address_shipping.first_name, " ", order_address_shipping.last_name)'));
-        $this->addFilter('is_preorder', DB::raw('COUNT(pre_order_items.id)'));
         $this->addFilter('id', 'orders.id');
         $this->addFilter('status', 'orders.status');
         $this->addFilter('created_at', 'orders.created_at');
diff --git a/packages/Webkul/SAASPreOrder/src/DataGrids/Admin/PreOrder.php b/packages/Webkul/PreOrder/src/DataGrids/Admin/PreOrder.php
similarity index 99%
rename from packages/Webkul/SAASPreOrder/src/DataGrids/Admin/PreOrder.php
rename to packages/Webkul/PreOrder/src/DataGrids/Admin/PreOrder.php
index 57006b6cf..4d4bd8fd7 100644
--- a/packages/Webkul/SAASPreOrder/src/DataGrids/Admin/PreOrder.php
+++ b/packages/Webkul/PreOrder/src/DataGrids/Admin/PreOrder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\DataGrids\Admin;
+namespace Webkul\PreOrder\DataGrids\Admin;
 
 use Webkul\Ui\DataGrid\DataGrid;
 use DB;
diff --git a/packages/Webkul/SAASPreOrder/src/Database/Migrations/2019_06_04_163237_create_pre_order_items_table.php b/packages/Webkul/PreOrder/src/Database/Migrations/2019_06_04_163237_create_pre_order_items_table.php
similarity index 99%
rename from packages/Webkul/SAASPreOrder/src/Database/Migrations/2019_06_04_163237_create_pre_order_items_table.php
rename to packages/Webkul/PreOrder/src/Database/Migrations/2019_06_04_163237_create_pre_order_items_table.php
index 22bc8f8c8..b5db7610c 100644
--- a/packages/Webkul/SAASPreOrder/src/Database/Migrations/2019_06_04_163237_create_pre_order_items_table.php
+++ b/packages/Webkul/PreOrder/src/Database/Migrations/2019_06_04_163237_create_pre_order_items_table.php
@@ -47,4 +47,4 @@ class CreatePreOrderItemsTable extends Migration
     {
         Schema::dropIfExists('pre_order_items');
     }
-}
\ No newline at end of file
+}
diff --git a/packages/Webkul/SAASPreOrder/src/Database/Seeders/AttributeSeeder.php b/packages/Webkul/PreOrder/src/Database/Seeders/AttributeSeeder.php
similarity index 98%
rename from packages/Webkul/SAASPreOrder/src/Database/Seeders/AttributeSeeder.php
rename to packages/Webkul/PreOrder/src/Database/Seeders/AttributeSeeder.php
index 0c35fd08e..98f9f20b0 100755
--- a/packages/Webkul/SAASPreOrder/src/Database/Seeders/AttributeSeeder.php
+++ b/packages/Webkul/PreOrder/src/Database/Seeders/AttributeSeeder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Database\Seeders;
+namespace Webkul\PreOrder\Database\Seeders;
 
 use Illuminate\Database\Seeder;
 use DB;
diff --git a/packages/Webkul/SAASPreOrder/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/PreOrder/src/Database/Seeders/DatabaseSeeder.php
similarity index 83%
rename from packages/Webkul/SAASPreOrder/src/Database/Seeders/DatabaseSeeder.php
rename to packages/Webkul/PreOrder/src/Database/Seeders/DatabaseSeeder.php
index 71d088dd4..28979a17c 100755
--- a/packages/Webkul/SAASPreOrder/src/Database/Seeders/DatabaseSeeder.php
+++ b/packages/Webkul/PreOrder/src/Database/Seeders/DatabaseSeeder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Database\Seeders;
+namespace Webkul\PreOrder\Database\Seeders;
 
 use Illuminate\Database\Seeder;
 
diff --git a/packages/Webkul/SAASPreOrder/src/Helpers/PreOrderDataPurger.php b/packages/Webkul/PreOrder/src/Helpers/PreOrderDataPurger.php
similarity index 98%
rename from packages/Webkul/SAASPreOrder/src/Helpers/PreOrderDataPurger.php
rename to packages/Webkul/PreOrder/src/Helpers/PreOrderDataPurger.php
index 694d148b9..198630fe2 100644
--- a/packages/Webkul/SAASPreOrder/src/Helpers/PreOrderDataPurger.php
+++ b/packages/Webkul/PreOrder/src/Helpers/PreOrderDataPurger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Helpers;
+namespace Webkul\PreOrder\Helpers;
 
 use Webkul\Attribute\Repositories\AttributeRepository as Attribute;
 use Webkul\Attribute\Repositories\AttributeFamilyRepository as AttributeFamily;
diff --git a/packages/Webkul/SAASPreOrder/src/Helpers/Product.php b/packages/Webkul/PreOrder/src/Helpers/Product.php
similarity index 97%
rename from packages/Webkul/SAASPreOrder/src/Helpers/Product.php
rename to packages/Webkul/PreOrder/src/Helpers/Product.php
index 09897e8c9..f05475405 100644
--- a/packages/Webkul/SAASPreOrder/src/Helpers/Product.php
+++ b/packages/Webkul/PreOrder/src/Helpers/Product.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Helpers;
+namespace Webkul\PreOrder\Helpers;
 
 use Webkul\Product\Repositories\ProductRepository;
 use Carbon\Carbon;
diff --git a/packages/Webkul/SAASPreOrder/src/Http/Controllers/Admin/Controller.php b/packages/Webkul/PreOrder/src/Http/Controllers/Admin/Controller.php
similarity index 85%
rename from packages/Webkul/SAASPreOrder/src/Http/Controllers/Admin/Controller.php
rename to packages/Webkul/PreOrder/src/Http/Controllers/Admin/Controller.php
index c0da023a8..ce821e1b4 100644
--- a/packages/Webkul/SAASPreOrder/src/Http/Controllers/Admin/Controller.php
+++ b/packages/Webkul/PreOrder/src/Http/Controllers/Admin/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Http\Controllers\Admin;
+namespace Webkul\PreOrder\Http\Controllers\Admin;
 
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
diff --git a/packages/Webkul/SAASPreOrder/src/Http/Controllers/Admin/PreorderController.php b/packages/Webkul/PreOrder/src/Http/Controllers/Admin/PreorderController.php
similarity index 88%
rename from packages/Webkul/SAASPreOrder/src/Http/Controllers/Admin/PreorderController.php
rename to packages/Webkul/PreOrder/src/Http/Controllers/Admin/PreorderController.php
index cfbda8a75..33728a034 100644
--- a/packages/Webkul/SAASPreOrder/src/Http/Controllers/Admin/PreorderController.php
+++ b/packages/Webkul/PreOrder/src/Http/Controllers/Admin/PreorderController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Http\Controllers\Admin;
+namespace Webkul\PreOrder\Http\Controllers\Admin;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Mail;
-use Webkul\SAASPreOrder\Repositories\PreOrderItemRepository;
-use Webkul\SAASPreOrder\Mail\ProductInStockNotification;
+use Webkul\PreOrder\Repositories\PreOrderItemRepository;
+use Webkul\PreOrder\Mail\ProductInStockNotification;
 
 /**
  * PreOrder controller
@@ -33,7 +33,7 @@ class PreOrderController extends Controller
     /**
      * Create a new controller instance.
      *
-     * @param  \Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
+     * @param  \Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
      * @return void
      */
     public function __construct(
@@ -51,7 +51,7 @@ class PreOrderController extends Controller
      * @return Mixed
      */
     public function index($url)
-    {
+    {   
         return view($this->_config['view']);
     }
 
diff --git a/packages/Webkul/SAASPreOrder/src/Http/Controllers/Shop/Controller.php b/packages/Webkul/PreOrder/src/Http/Controllers/Shop/Controller.php
similarity index 82%
rename from packages/Webkul/SAASPreOrder/src/Http/Controllers/Shop/Controller.php
rename to packages/Webkul/PreOrder/src/Http/Controllers/Shop/Controller.php
index d5ac3cb8a..ef40c3d6e 100644
--- a/packages/Webkul/SAASPreOrder/src/Http/Controllers/Shop/Controller.php
+++ b/packages/Webkul/PreOrder/src/Http/Controllers/Shop/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Http\Controllers\Shop;
+namespace Webkul\PreOrder\Http\Controllers\Shop;
 
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
diff --git a/packages/Webkul/SAASPreOrder/src/Http/Controllers/Shop/PreOrderController.php b/packages/Webkul/PreOrder/src/Http/Controllers/Shop/PreOrderController.php
similarity index 90%
rename from packages/Webkul/SAASPreOrder/src/Http/Controllers/Shop/PreOrderController.php
rename to packages/Webkul/PreOrder/src/Http/Controllers/Shop/PreOrderController.php
index 1050878f7..0175e42fe 100644
--- a/packages/Webkul/SAASPreOrder/src/Http/Controllers/Shop/PreOrderController.php
+++ b/packages/Webkul/PreOrder/src/Http/Controllers/Shop/PreOrderController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Http\Controllers\Shop;
+namespace Webkul\PreOrder\Http\Controllers\Shop;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Event;
 use Webkul\Product\Repositories\ProductRepository;
 use Webkul\Sales\Repositories\OrderItemRepository;
-use Webkul\SAASPreOrder\Repositories\PreOrderItemRepository;
+use Webkul\PreOrder\Repositories\PreOrderItemRepository;
 use Cart;
 
 /**
@@ -45,7 +45,7 @@ class PreOrderController extends Controller
      *
      * @param  Webkul\Product\Repositories\ProductRepository       $productRepository
      * @param  Webkul\Sales\Repositories\OrderItemRepository       $orderItemRepository
-     * @param  Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
+     * @param  Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
      * @return void
      */
     public function __construct(
@@ -75,13 +75,16 @@ class PreOrderController extends Controller
             if (! $preOrderItem)
                 return abort(404);
 
+            if ($preOrderItem->payment_order_item_id != null)
+                throw new \Exception('Payment has been done for this order');
+
             $orderItem = $this->orderItemRepository->findOrFail($preOrderItem->order_item_id);
 
             if (! $this->preOrderItemRepository->canBeComplete($orderItem)) {
                 session()->flash('error', trans('preorder::app.shop.preorders.complete-preorder-error'));
 
                 if (request()->route('token'))
-                    return redirct()->route('shop.home.index');
+                    return redirect()->route('shop.home.index');
                 else
                     return back();
             }
diff --git a/packages/Webkul/SAASPreOrder/src/Http/admin-routes.php b/packages/Webkul/PreOrder/src/Http/admin-routes.php
similarity index 63%
rename from packages/Webkul/SAASPreOrder/src/Http/admin-routes.php
rename to packages/Webkul/PreOrder/src/Http/admin-routes.php
index 40802f72a..cc24c5b88 100644
--- a/packages/Webkul/SAASPreOrder/src/Http/admin-routes.php
+++ b/packages/Webkul/PreOrder/src/Http/admin-routes.php
@@ -7,12 +7,12 @@ Route::group(['middleware' => ['web']], function () {
         Route::group(['middleware' => ['admin']], function () {
 
             //Seller routes
-            Route::get('preorders', 'Webkul\SAASPreOrder\Http\Controllers\Admin\PreOrderController@index')->defaults('_config', [
+            Route::get('preorders', 'Webkul\PreOrder\Http\Controllers\Admin\PreOrderController@index')->defaults('_config', [
                 'view' => 'preorder::admin.preorders.index'
             ])->name('admin.preorder.preorders.index');
 
             //product massdelete
-            Route::post('preorders/notify-customer', 'Webkul\SAASPreOrder\Http\Controllers\Admin\PreOrderController@notifyCustomer')->defaults('_config', [
+            Route::post('preorders/notify-customer', 'Webkul\PreOrder\Http\Controllers\Admin\PreOrderController@notifyCustomer')->defaults('_config', [
                 'redirect' => 'admin.preorder.preorders.index'
             ])->name('admin.preorder.preorders.notify-customer');
         });
diff --git a/packages/Webkul/PreOrder/src/Http/front-routes.php b/packages/Webkul/PreOrder/src/Http/front-routes.php
new file mode 100644
index 000000000..2e45e35b3
--- /dev/null
+++ b/packages/Webkul/PreOrder/src/Http/front-routes.php
@@ -0,0 +1,5 @@
+<?php
+
+Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function () {
+    Route::get('/complete-preorder/{token}', 'Webkul\PreOrder\Http\Controllers\Shop\PreOrderController@complete')->name('preorder.shop.preorder.complete');
+});
\ No newline at end of file
diff --git a/packages/Webkul/SAASPreOrder/src/Listeners/Cart.php b/packages/Webkul/PreOrder/src/Listeners/Cart.php
similarity index 95%
rename from packages/Webkul/SAASPreOrder/src/Listeners/Cart.php
rename to packages/Webkul/PreOrder/src/Listeners/Cart.php
index 88fccc784..30f685596 100644
--- a/packages/Webkul/SAASPreOrder/src/Listeners/Cart.php
+++ b/packages/Webkul/PreOrder/src/Listeners/Cart.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Listeners;
+namespace Webkul\PreOrder\Listeners;
 
 use Cart as CartFacade;
 use Webkul\Product\Repositories\ProductRepository;
 use Webkul\Product\Helpers\Price as PriceHelper;
-use Webkul\SAASPreOrder\Repositories\PreOrderItemRepository;
+use Webkul\PreOrder\Repositories\PreOrderItemRepository;
 
 /**
  * Cart event handler
@@ -41,7 +41,7 @@ class Cart
      *
      * @param  Webkul\Product\Helpers\Price                        $priceHelper
      * @param  Webkul\Product\Repositories\ProductRepository       $productRepository
-     * @param  Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
+     * @param  Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
      * @return void
      */
     public function __construct(
@@ -161,8 +161,8 @@ class Cart
             $product = $this->productRepository->find($cartItem->product_id);
 
             if ($product->type == 'configurable') {
-                if (isset($cartItem->child->product_id)) {
-                    $product = $this->productRepository->find($cartItem->child->product_id);
+                if (isset($cartItem['additional']['selected_configurable_option'])) {
+                    $product = $this->productRepository->find($cartItem['additional']['selected_configurable_option']);
                 } else {
                     return;
                 }
diff --git a/packages/Webkul/SAASPreOrder/src/Listeners/Invoice.php b/packages/Webkul/PreOrder/src/Listeners/Invoice.php
similarity index 91%
rename from packages/Webkul/SAASPreOrder/src/Listeners/Invoice.php
rename to packages/Webkul/PreOrder/src/Listeners/Invoice.php
index 308c5e4cb..ea542fc7c 100644
--- a/packages/Webkul/SAASPreOrder/src/Listeners/Invoice.php
+++ b/packages/Webkul/PreOrder/src/Listeners/Invoice.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Listeners;
+namespace Webkul\PreOrder\Listeners;
 
-use Webkul\SAASPreOrder\Repositories\PreOrderItemRepository;
+use Webkul\PreOrder\Repositories\PreOrderItemRepository;
 use Webkul\Sales\Repositories\OrderRepository;
 
 /**
@@ -30,7 +30,7 @@ class Invoice
     /**
      * Create a new Order event listener instance.
      *
-     * @param  Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
+     * @param  Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
      * @param  Webkul\Sales\Repositories\OrderRepository $orderRepository
      * @return void
      */
diff --git a/packages/Webkul/SAASPreOrder/src/Listeners/Order.php b/packages/Webkul/PreOrder/src/Listeners/Order.php
similarity index 83%
rename from packages/Webkul/SAASPreOrder/src/Listeners/Order.php
rename to packages/Webkul/PreOrder/src/Listeners/Order.php
index 2d59c7585..58b7f5fa2 100644
--- a/packages/Webkul/SAASPreOrder/src/Listeners/Order.php
+++ b/packages/Webkul/PreOrder/src/Listeners/Order.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Listeners;
+namespace Webkul\PreOrder\Listeners;
 
 use Cart as CartFacade;
-use Webkul\SAASPreOrder\Repositories\PreOrderItemRepository;
+use Webkul\PreOrder\Repositories\PreOrderItemRepository;
 use Webkul\Product\Helpers\Price as PriceHelper;
 
 /**
@@ -32,7 +32,7 @@ class Order
      * Create a new Order event listener instance.
      *
      * @param  Webkul\Product\Helpers\Price                        $priceHelper
-     * @param  Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
+     * @param  Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
      * @return void
      */
     public function __construct(
@@ -61,16 +61,14 @@ class Order
                     'payment_order_item_id' => $item->id
                 ], $preOrderItem->id);
             } else {
-                if ($item->product->type == 'configurable') {
-                    if (isset($item->child->product_id)) {
-                        if ($item->child->product->totalQuantity() > 0 || ! $item->child->product->allow_preorder)
-                            continue;
-                    } else {
-                        return;
+                if ($item->type == 'configurable') {
+                    if ($item->child->product->totalQuantity() > -1 || ! $item->child->product->allow_preorder) {
+                        continue;
                     }
                 } else {
-                    if ($item->product->totalQuantity() > 0 || ! $item->product->allow_preorder)
+                    if ($item->product->totalQuantity() > -1 || ! $item->product->allow_preorder) {
                         continue;
+                    }
                 }
 
                 if (core()->getConfigData('preorder.settings.general.preorder_type') == 'partial') {
diff --git a/packages/Webkul/SAASPreOrder/src/Mail/ProductInStockNotification.php b/packages/Webkul/PreOrder/src/Mail/ProductInStockNotification.php
similarity index 96%
rename from packages/Webkul/SAASPreOrder/src/Mail/ProductInStockNotification.php
rename to packages/Webkul/PreOrder/src/Mail/ProductInStockNotification.php
index 50af825b5..d9f9bc1f3 100644
--- a/packages/Webkul/SAASPreOrder/src/Mail/ProductInStockNotification.php
+++ b/packages/Webkul/PreOrder/src/Mail/ProductInStockNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Mail;
+namespace Webkul\PreOrder\Mail;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
@@ -16,7 +16,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 class ProductInStockNotification extends Mailable
 {
     use Queueable, SerializesModels;
-
+    
     /**
      * The order item instance.
      *
diff --git a/packages/Webkul/SAASPreOrder/src/Models/PreOrderItem.php b/packages/Webkul/PreOrder/src/Models/PreOrderItem.php
similarity index 69%
rename from packages/Webkul/SAASPreOrder/src/Models/PreOrderItem.php
rename to packages/Webkul/PreOrder/src/Models/PreOrderItem.php
index 68a2e912e..6f5419e99 100644
--- a/packages/Webkul/SAASPreOrder/src/Models/PreOrderItem.php
+++ b/packages/Webkul/PreOrder/src/Models/PreOrderItem.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Models;
+namespace Webkul\PreOrder\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Webkul\SAASPreOrder\Contracts\PreOrderItem as PreOrderItemContract;
+use Webkul\PreOrder\Contracts\PreOrderItem as PreOrderItemContract;
 use Webkul\Sales\Models\OrderProxy;
 use Webkul\Sales\Models\OrderItemProxy;
 
 class PreOrderItem extends Model implements PreOrderItemContract
 {
     public $timestamps = false;
-
+    
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['preorder_type', 'preorder_percent', 'status', 'email_sent', 'paid_amount', 'base_paid_amount', 'base_remaining_amount', 'order_id', 'order_item_id', 'payment_order_item_id', 'token', 'company_id'];
+    protected $fillable = ['preorder_type', 'preorder_percent', 'status', 'email_sent', 'paid_amount', 'base_paid_amount', 'base_remaining_amount', 'order_id', 'order_item_id', 'payment_order_item_id', 'token'];
 
     protected $statusLabel = [
         'pending' => 'Pending',
@@ -68,22 +68,4 @@ class PreOrderItem extends Model implements PreOrderItemContract
     {
         return $this->typeLabel[$this->preorder_type];
     }
-
-    /**
-     * Create a new Eloquent query builder for the model.
-     *
-     * @param  \Illuminate\Database\Query\Builder  $query
-     * @return \Illuminate\Database\Eloquent\Builder|static
-     */
-    public function newEloquentBuilder($query)
-    {
-
-        $company = \Company::getCurrent();
-
-        if (auth()->guard('super-admin')->check() || ! isset($company->id)) {
-            return new \Illuminate\Database\Eloquent\Builder($query);
-        } else {
-            return new \Illuminate\Database\Eloquent\Builder($query->where('pre_order_items' . '.company_id', $company->id));
-        }
-    }
-}
\ No newline at end of file
+}
diff --git a/packages/Webkul/SAASPreOrder/src/Models/PreOrderItemProxy.php b/packages/Webkul/PreOrder/src/Models/PreOrderItemProxy.php
similarity index 70%
rename from packages/Webkul/SAASPreOrder/src/Models/PreOrderItemProxy.php
rename to packages/Webkul/PreOrder/src/Models/PreOrderItemProxy.php
index e5b9e8d70..60d08d8d0 100644
--- a/packages/Webkul/SAASPreOrder/src/Models/PreOrderItemProxy.php
+++ b/packages/Webkul/PreOrder/src/Models/PreOrderItemProxy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Models;
+namespace Webkul\PreOrder\Models;
 
 use Konekt\Concord\Proxies\ModelProxy;
 
diff --git a/packages/Webkul/SAASPreOrder/src/Observers/SAASPreOrderObserver.php b/packages/Webkul/PreOrder/src/Observers/PreOrderObserver.php
similarity index 64%
rename from packages/Webkul/SAASPreOrder/src/Observers/SAASPreOrderObserver.php
rename to packages/Webkul/PreOrder/src/Observers/PreOrderObserver.php
index ab7748657..115859dc8 100644
--- a/packages/Webkul/SAASPreOrder/src/Observers/SAASPreOrderObserver.php
+++ b/packages/Webkul/PreOrder/src/Observers/PreOrderObserver.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Observers;
+namespace Webkul\PreOrder\Observers;
 
-use Webkul\SAASPreOrder\Models\PreOrderItem;
+use Webkul\PreOrder\Models\PreOrderItem;
 
 use Company;
 
-class SAASPreOrderItemObserver
+class PreOrderItemObserver
 {
     public function creating(PreOrderItem $model)
     {
diff --git a/packages/Webkul/SAASPreOrder/src/Providers/EventServiceProvider.php b/packages/Webkul/PreOrder/src/Providers/EventServiceProvider.php
similarity index 53%
rename from packages/Webkul/SAASPreOrder/src/Providers/EventServiceProvider.php
rename to packages/Webkul/PreOrder/src/Providers/EventServiceProvider.php
index 0b6d83016..e9cadc202 100644
--- a/packages/Webkul/SAASPreOrder/src/Providers/EventServiceProvider.php
+++ b/packages/Webkul/PreOrder/src/Providers/EventServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Providers;
+namespace Webkul\PreOrder\Providers;
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Event;
@@ -22,14 +22,14 @@ class EventServiceProvider extends ServiceProvider
             $viewRenderEventManager->addTemplate('preorder::shop.products.preorder-info');
         });
 
-        Event::listen('checkout.cart.add.before', 'Webkul\SAASPreOrder\Listeners\Cart@cartItemAddBefore');
+        Event::listen('checkout.cart.add.before', 'Webkul\PreOrder\Listeners\Cart@cartItemAddBefore');
 
-        Event::listen('checkout.cart.update.before', 'Webkul\SAASPreOrder\Listeners\Cart@cartItemUpdateBefore');
+        Event::listen('checkout.cart.update.before', 'Webkul\PreOrder\Listeners\Cart@cartItemUpdateBefore');
 
-        Event::listen('checkout.cart.add.after', 'Webkul\SAASPreOrder\Listeners\Cart@cartItemAddAfter');
+        Event::listen('checkout.cart.add.after', 'Webkul\PreOrder\Listeners\Cart@cartItemAddAfter');
 
-        Event::listen('checkout.order.save.after', 'Webkul\SAASPreOrder\Listeners\Order@afterPlaceOrder');
+        Event::listen('checkout.order.save.after', 'Webkul\PreOrder\Listeners\Order@afterPlaceOrder');
 
-        Event::listen('sales.invoice.save.after', 'Webkul\SAASPreOrder\Listeners\Invoice@afterInvoice');
+        Event::listen('sales.invoice.save.after', 'Webkul\PreOrder\Listeners\Invoice@afterInvoice');
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/SAASPreOrder/src/Providers/ModuleServiceProvider.php b/packages/Webkul/PreOrder/src/Providers/ModuleServiceProvider.php
similarity index 60%
rename from packages/Webkul/SAASPreOrder/src/Providers/ModuleServiceProvider.php
rename to packages/Webkul/PreOrder/src/Providers/ModuleServiceProvider.php
index 073bdebab..f54ee3633 100644
--- a/packages/Webkul/SAASPreOrder/src/Providers/ModuleServiceProvider.php
+++ b/packages/Webkul/PreOrder/src/Providers/ModuleServiceProvider.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Providers;
+namespace Webkul\PreOrder\Providers;
 
 use Konekt\Concord\BaseModuleServiceProvider;
 
 class ModuleServiceProvider extends BaseModuleServiceProvider
 {
     protected $models = [
-        \Webkul\SAASPreOrder\Models\PreOrderItem::class,
+        \Webkul\PreOrder\Models\PreOrderItem::class,
     ];
 }
\ No newline at end of file
diff --git a/packages/Webkul/SAASPreOrder/src/Providers/SAASPreorderServiceProvider.php b/packages/Webkul/PreOrder/src/Providers/PreorderServiceProvider.php
similarity index 90%
rename from packages/Webkul/SAASPreOrder/src/Providers/SAASPreorderServiceProvider.php
rename to packages/Webkul/PreOrder/src/Providers/PreorderServiceProvider.php
index e49a671bd..4da65721e 100755
--- a/packages/Webkul/SAASPreOrder/src/Providers/SAASPreorderServiceProvider.php
+++ b/packages/Webkul/PreOrder/src/Providers/PreorderServiceProvider.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Providers;
+namespace Webkul\PreOrder\Providers;
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Routing\Router;
-use Webkul\SAASPreOrder\Shipping;
+use Webkul\PreOrder\Shipping;
 use Illuminate\Foundation\AliasLoader;
 use Webkul\Shipping\Facades\Shipping as ShippingFacade;
 
-class SAASPreOrderServiceProvider extends ServiceProvider
+class PreOrderServiceProvider extends ServiceProvider
 {
     protected $commands = [
-        'Webkul\SAASPreOrder\Commands\Console\GenerateData'
+        'Webkul\PreOrder\Commands\Console\GenerateData'
     ];
 
     /**
@@ -54,7 +54,7 @@ class SAASPreOrderServiceProvider extends ServiceProvider
      */
     public function bootModelObservers()
     {
-        \Webkul\SAASPreOrder\Models\PreOrderItem::observe(\Webkul\SAASPreOrder\Observers\SAASPreOrderItemObserver::class);
+        \Webkul\PreOrder\Models\PreOrderItem::observe(\Webkul\PreOrder\Observers\PreOrderItemObserver::class);
     }
 
     /**
diff --git a/packages/Webkul/SAASPreOrder/src/Repositories/PreOrderItemRepository.php b/packages/Webkul/PreOrder/src/Repositories/PreOrderItemRepository.php
similarity index 95%
rename from packages/Webkul/SAASPreOrder/src/Repositories/PreOrderItemRepository.php
rename to packages/Webkul/PreOrder/src/Repositories/PreOrderItemRepository.php
index 3df38097b..82366393e 100755
--- a/packages/Webkul/SAASPreOrder/src/Repositories/PreOrderItemRepository.php
+++ b/packages/Webkul/PreOrder/src/Repositories/PreOrderItemRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder\Repositories;
+namespace Webkul\PreOrder\Repositories;
 
 use Webkul\Core\Eloquent\Repository;
 
@@ -20,7 +20,7 @@ class PreOrderItemRepository extends Repository
 
     function model()
     {
-        return 'Webkul\SAASPreOrder\Contracts\PreOrderItem';
+        return 'Webkul\PreOrder\Contracts\PreOrderItem';
     }
 
     /**
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/assets/images/Icon-Preorder-Active.svg b/packages/Webkul/PreOrder/src/Resources/assets/images/Icon-Preorder-Active.svg
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Resources/assets/images/Icon-Preorder-Active.svg
rename to packages/Webkul/PreOrder/src/Resources/assets/images/Icon-Preorder-Active.svg
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/assets/images/Icon-Preorder.svg b/packages/Webkul/PreOrder/src/Resources/assets/images/Icon-Preorder.svg
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Resources/assets/images/Icon-Preorder.svg
rename to packages/Webkul/PreOrder/src/Resources/assets/images/Icon-Preorder.svg
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/assets/sass/admin.scss b/packages/Webkul/PreOrder/src/Resources/assets/sass/admin.scss
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Resources/assets/sass/admin.scss
rename to packages/Webkul/PreOrder/src/Resources/assets/sass/admin.scss
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/assets/sass/app.scss b/packages/Webkul/PreOrder/src/Resources/assets/sass/app.scss
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Resources/assets/sass/app.scss
rename to packages/Webkul/PreOrder/src/Resources/assets/sass/app.scss
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/assets/sass/icons.scss b/packages/Webkul/PreOrder/src/Resources/assets/sass/icons.scss
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Resources/assets/sass/icons.scss
rename to packages/Webkul/PreOrder/src/Resources/assets/sass/icons.scss
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/lang/en/app.php b/packages/Webkul/PreOrder/src/Resources/lang/en/app.php
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Resources/lang/en/app.php
rename to packages/Webkul/PreOrder/src/Resources/lang/en/app.php
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/admin/layouts/style.blade.php b/packages/Webkul/PreOrder/src/Resources/views/admin/layouts/style.blade.php
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Resources/views/admin/layouts/style.blade.php
rename to packages/Webkul/PreOrder/src/Resources/views/admin/layouts/style.blade.php
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/admin/preorders/index.blade.php b/packages/Webkul/PreOrder/src/Resources/views/admin/preorders/index.blade.php
similarity index 84%
rename from packages/Webkul/SAASPreOrder/src/Resources/views/admin/preorders/index.blade.php
rename to packages/Webkul/PreOrder/src/Resources/views/admin/preorders/index.blade.php
index dd3294ab7..9133bb40d 100644
--- a/packages/Webkul/SAASPreOrder/src/Resources/views/admin/preorders/index.blade.php
+++ b/packages/Webkul/PreOrder/src/Resources/views/admin/preorders/index.blade.php
@@ -11,14 +11,14 @@
             <div class="page-title">
                 <h1>{{ __('preorder::app.admin.preorders.title') }}</h1>
             </div>
-
+            
             <div class="page-action">
             </div>
         </div>
 
         <div class="page-content">
 
-            {!! app('Webkul\SAASPreOrder\DataGrids\Admin\PreOrder')->render() !!}
+            {!! app('Webkul\PreOrder\DataGrids\Admin\PreOrder')->render() !!}
 
         </div>
     </div>
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/admin/sales/orders/index.blade.php b/packages/Webkul/PreOrder/src/Resources/views/admin/sales/orders/index.blade.php
similarity index 91%
rename from packages/Webkul/SAASPreOrder/src/Resources/views/admin/sales/orders/index.blade.php
rename to packages/Webkul/PreOrder/src/Resources/views/admin/sales/orders/index.blade.php
index 630e22919..fde3254d3 100644
--- a/packages/Webkul/SAASPreOrder/src/Resources/views/admin/sales/orders/index.blade.php
+++ b/packages/Webkul/PreOrder/src/Resources/views/admin/sales/orders/index.blade.php
@@ -22,8 +22,8 @@
         </div>
 
         <div class="page-content">
-            @inject('orderGrid', 'Webkul\SAASPreOrder\DataGrids\Admin\Order')
-
+            @inject('orderGrid', 'Webkul\PreOrder\DataGrids\Admin\Order')
+            
             {!! $orderGrid->render() !!}
         </div>
     </div>
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/admin/sales/orders/view.blade.php b/packages/Webkul/PreOrder/src/Resources/views/admin/sales/orders/view.blade.php
similarity index 98%
rename from packages/Webkul/SAASPreOrder/src/Resources/views/admin/sales/orders/view.blade.php
rename to packages/Webkul/PreOrder/src/Resources/views/admin/sales/orders/view.blade.php
index bbff2b87a..065ec8bd8 100644
--- a/packages/Webkul/SAASPreOrder/src/Resources/views/admin/sales/orders/view.blade.php
+++ b/packages/Webkul/PreOrder/src/Resources/views/admin/sales/orders/view.blade.php
@@ -31,7 +31,7 @@
                     </a>
                 @endif
 
-                @if ($order->canShip() && ! app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->resetScope()->isPreOrderPaymentOrder($order->id))
+                @if ($order->canShip() && ! app('Webkul\PreOrder\Repositories\PreOrderItemRepository')->resetScope()->isPreOrderPaymentOrder($order->id))
                     <a href="{{ route('admin.sales.shipments.create', $order->id) }}" class="btn btn-lg btn-primary">
                         {{ __('admin::app.sales.orders.shipment-btn-title') }}
                     </a>
@@ -46,7 +46,7 @@
                     <div class="sale-container">
 
                         <?php
-                            $preOrderItemRepository = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository');
+                            $preOrderItemRepository = app('Webkul\PreOrder\Repositories\PreOrderItemRepository');
 
                             $havePreOrderItems = $preOrderItemRepository->havePreOrderItems($order->id);
                         ?>
@@ -296,7 +296,7 @@
                                                                     </span>
                                                                 @endif
                                                             </div>
-                                                        @elseif ($preOrderItem = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->findOneByField('payment_order_item_id', $item->id))
+                                                        @elseif ($preOrderItem = app('Webkul\PreOrder\Repositories\PreOrderItemRepository')->findOneByField('payment_order_item_id', $item->id))
                                                             <div class="pre-order-item-info">
                                                                 <span class="heading" @if($item->type == 'configurable')style="margin-top: 0"@endif>
                                                                     {{ __('preorder::app.admin.sales.orders.preorder-payment-information') }}
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/emails/in-stock.blade.php b/packages/Webkul/PreOrder/src/Resources/views/emails/in-stock.blade.php
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Resources/views/emails/in-stock.blade.php
rename to packages/Webkul/PreOrder/src/Resources/views/emails/in-stock.blade.php
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/customers/account/orders/view.blade.php b/packages/Webkul/PreOrder/src/Resources/views/shop/customers/account/orders/view.blade.php
similarity index 99%
rename from packages/Webkul/SAASPreOrder/src/Resources/views/shop/customers/account/orders/view.blade.php
rename to packages/Webkul/PreOrder/src/Resources/views/shop/customers/account/orders/view.blade.php
index a5a1b8764..9e3483e70 100644
--- a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/customers/account/orders/view.blade.php
+++ b/packages/Webkul/PreOrder/src/Resources/views/shop/customers/account/orders/view.blade.php
@@ -31,7 +31,7 @@
                     <tab name="{{ __('shop::app.customer.account.order.view.info') }}" :selected="true">
 
                         <?php
-                            $preOrderItemRepository = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository');
+                            $preOrderItemRepository = app('Webkul\PreOrder\Repositories\PreOrderItemRepository');
 
                             $havePreOrderItems = $preOrderItemRepository->havePreOrderItems($order->id);
                         ?>
@@ -114,7 +114,7 @@
                                                                     </span>
                                                                 @endif
                                                             </div>
-                                                        @elseif ($preOrderItem = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->resetScope()->findOneByField('payment_order_item_id', $item->id))
+                                                        @elseif ($preOrderItem = app('Webkul\PreOrder\Repositories\PreOrderItemRepository')->resetScope()->findOneByField('payment_order_item_id', $item->id))
                                                             <div class="pre-order-item-info">
                                                                 <span class="heading" @if($item->type == 'configurable')style="margin-top: 0"@endif>
                                                                     {{ __('preorder::app.shop.sales.orders.preorder-payment-information') }}
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/add-buttons.blade.php b/packages/Webkul/PreOrder/src/Resources/views/shop/products/add-buttons.blade.php
similarity index 94%
rename from packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/add-buttons.blade.php
rename to packages/Webkul/PreOrder/src/Resources/views/shop/products/add-buttons.blade.php
index 76d0a7409..6637312a7 100644
--- a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/add-buttons.blade.php
+++ b/packages/Webkul/PreOrder/src/Resources/views/shop/products/add-buttons.blade.php
@@ -3,8 +3,6 @@
         @if (core()->getConfigData('preorder.settings.general.preorder_type') == 'partial')
             <p>{{ __('preorder::app.shop.products.percent-to-pay', ['percent' => core()->getConfigData('preorder.settings.general.percent')]) }}</p>
         @endif
-    @else
-        <p>{{ __('preorder::app.shop.products.nothing-to-pay') }}</p>
     @endif
 @endif
 
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/preorder-info.blade.php b/packages/Webkul/PreOrder/src/Resources/views/shop/products/preorder-info.blade.php
similarity index 89%
rename from packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/preorder-info.blade.php
rename to packages/Webkul/PreOrder/src/Resources/views/shop/products/preorder-info.blade.php
index 27e625d6b..10345a30d 100644
--- a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/preorder-info.blade.php
+++ b/packages/Webkul/PreOrder/src/Resources/views/shop/products/preorder-info.blade.php
@@ -4,8 +4,6 @@
         @if (core()->getConfigData('preorder.settings.general.preorder_type') == 'partial')
             @if (core()->getConfigData('preorder.settings.general.percent'))
                 <p style="font-weight: 600;">{{ __('preorder::app.shop.products.percent-to-pay', ['percent' => core()->getConfigData('preorder.settings.general.percent')]) }}</p>
-            @else
-                <p style="font-weight: 600;">{{ __('preorder::app.shop.products.nothing-to-pay') }}</p>
             @endif
         @endif
 
@@ -29,8 +27,6 @@
         @if (core()->getConfigData('preorder.settings.general.preorder_type') == 'partial')
             @if (core()->getConfigData('preorder.settings.general.percent'))
                 <p style="font-weight: 600;">{{ __('preorder::app.shop.products.percent-to-pay', ['percent' => core()->getConfigData('preorder.settings.general.percent')]) }}</p>
-            @else
-                <p style="font-weight: 600;">{{ __('preorder::app.shop.products.nothing-to-pay') }}</p>
             @endif
         @endif
 
@@ -45,7 +41,7 @@
     @push('scripts')
 
         <script>
-            var variants = @json(app('Webkul\SAASPreOrder\Helpers\Product')->getPreOrderVariants($product));
+            var variants = @json(app('Webkul\PreOrder\Helpers\Product')->getPreOrderVariants($product));
 
             eventBus.$on('configurable-variant-selected-event', function(variantId) {
                 if (typeof variants[variantId] != "undefined") {
diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/view/product-add.blade.php b/packages/Webkul/PreOrder/src/Resources/views/shop/products/view/product-add.blade.php
similarity index 100%
rename from packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/view/product-add.blade.php
rename to packages/Webkul/PreOrder/src/Resources/views/shop/products/view/product-add.blade.php
diff --git a/packages/Webkul/SAASPreOrder/src/Shipping.php b/packages/Webkul/PreOrder/src/Shipping.php
similarity index 98%
rename from packages/Webkul/SAASPreOrder/src/Shipping.php
rename to packages/Webkul/PreOrder/src/Shipping.php
index 96fffe6b6..34dbec218 100644
--- a/packages/Webkul/SAASPreOrder/src/Shipping.php
+++ b/packages/Webkul/PreOrder/src/Shipping.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\SAASPreOrder;
+namespace Webkul\PreOrder;
 
 use Illuminate\Support\Facades\Config;
 use Webkul\Checkout\Facades\Cart;
diff --git a/packages/Webkul/SAASPreOrder/webpack.mix.js b/packages/Webkul/PreOrder/webpack.mix.js
similarity index 100%
rename from packages/Webkul/SAASPreOrder/webpack.mix.js
rename to packages/Webkul/PreOrder/webpack.mix.js
diff --git a/packages/Webkul/SAASPreOrder/src/Config/purge-pool.php b/packages/Webkul/SAASPreOrder/src/Config/purge-pool.php
deleted file mode 100644
index c63280224..000000000
--- a/packages/Webkul/SAASPreOrder/src/Config/purge-pool.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'preorderseeder' => 'Webkul\SAASPreOrder\Helpers\PreOrderDataPurger'
-];
\ No newline at end of file
diff --git a/packages/Webkul/SAASPreOrder/src/Contracts/PreOrderItem.php b/packages/Webkul/SAASPreOrder/src/Contracts/PreOrderItem.php
deleted file mode 100644
index 110820668..000000000
--- a/packages/Webkul/SAASPreOrder/src/Contracts/PreOrderItem.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Webkul\SAASPreOrder\Contracts;
-
-interface PreOrderItem
-{
-}
\ No newline at end of file
diff --git a/packages/Webkul/SAASPreOrder/src/Http/front-routes.php b/packages/Webkul/SAASPreOrder/src/Http/front-routes.php
deleted file mode 100644
index 148b7418b..000000000
--- a/packages/Webkul/SAASPreOrder/src/Http/front-routes.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function () {
-    Route::get('/complete-preorder/{token}', 'Webkul\SAASPreOrder\Http\Controllers\Shop\PreOrderController@complete')->name('preorder.shop.preorder.complete');
-});
\ No newline at end of file
diff --git a/packages/Webkul/StripeConnect/src/Http/Controllers/StripeConnectController.php b/packages/Webkul/StripeConnect/src/Http/Controllers/StripeConnectController.php
index 32c61458b..e39a4b99c 100644
--- a/packages/Webkul/StripeConnect/src/Http/Controllers/StripeConnectController.php
+++ b/packages/Webkul/StripeConnect/src/Http/Controllers/StripeConnectController.php
@@ -300,16 +300,16 @@ class StripeConnectController extends Controller
 
                 // admin or owner commission
                 $ownerCommissionRate = env('STRIPE_ADMIN_COMMISSION') ?? 0.0;
-                $ownerCommission = $baseGrandTotal * $ownerCommissionRate;
+                $ownerCommission = ($baseGrandTotal * $ownerCommissionRate) / 100;
 
-                $applicationFee = round($ownerCommission, 2) * 100;
+                $applicationFee = round($ownerCommission, 2);
 
                 $result = StripeCharge::create([
                     "amount" => round(Cart::getCart()->base_grand_total - $applicationFee, 2) * 100,
                     "currency" => Cart::getCart()->base_currency_code,
                     "source" => $stripeToken,
                     "description" => "Purchased ".Cart::getCart()->items_count." items on ".config('app.name'),
-                    "application_fee_amount" => $applicationFee,
+                    "application_fee_amount" => $applicationFee * 100,
                     "statement_descriptor" => $this->statementDescriptor
                 ], [
                     "stripe_account" => $sellerUserId
@@ -319,9 +319,9 @@ class StripeConnectController extends Controller
 
                 // admin's or owner's commission
                 $ownerCommissionRate = env('STRIPE_ADMIN_COMMISSION') ?? 0.0;
-                $ownerCommission = $baseGrandTotal * $ownerCommissionRate;
+                $ownerCommission = ($baseGrandTotal * $ownerCommissionRate) / 100;
 
-                $applicationFee = round($ownerCommission, 2) * 100;
+                $applicationFee = round($ownerCommission, 2);
 
                 $cart->update([
                     'base_grand_total' => $cart->grand_total + $applicationFee,
@@ -333,7 +333,7 @@ class StripeConnectController extends Controller
                     "currency" => Cart::getCart()->base_currency_code,
                     "source" => $stripeToken,
                     "description" => "Purchased ".Cart::getCart()->items_count." items on ".config('app.name'),
-                    "application_fee_amount" => $applicationFee,
+                    "application_fee_amount" => $applicationFee * 100,
                     "statement_descriptor" => $this->statementDescriptor
                 ], [
                     "stripe_account" => $sellerUserId
diff --git a/resources/views/vendor/shop/checkout/total/summary.blade.php b/resources/views/vendor/shop/checkout/total/summary.blade.php
index b10bc9986..cfca3e386 100644
--- a/resources/views/vendor/shop/checkout/total/summary.blade.php
+++ b/resources/views/vendor/shop/checkout/total/summary.blade.php
@@ -24,7 +24,6 @@
         </div>
     @endif
 
-
     <div class="item-detail" id="discount-detail" @if ($cart->discount_amount && $cart->discount_amount > 0) style="display: block;" @else style="display: none;" @endif>
         <label>
             <b>{{ __('shop::app.checkout.total.disc-amount') }}</b>