diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..80b1e5c0b279ef32fb8ecef641bb2d2719afa40c
Binary files /dev/null and b/.DS_Store differ
diff --git a/app/.DS_Store b/app/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a46730910c490445066f7a49276962d49d7444e5
Binary files /dev/null and b/app/.DS_Store differ
diff --git a/app/code/.DS_Store b/app/code/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..97d3c73c67e7e21804b046607cbee3405af41385
Binary files /dev/null and b/app/code/.DS_Store differ
diff --git a/app/code/BobGroup/.DS_Store b/app/code/BobGroup/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..778d09bc4dd9897be93f35a8950ffaf2f248203c
Binary files /dev/null and b/app/code/BobGroup/.DS_Store differ
diff --git a/app/code/BobGroup/BobGo/.DS_Store b/app/code/BobGroup/BobGo/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..8d6d369e973c993a56c23259df6f2b1e363afe16
Binary files /dev/null and b/app/code/BobGroup/BobGo/.DS_Store differ
diff --git a/app/code/BobGroup/BobGo/Block/.DS_Store b/app/code/BobGroup/BobGo/Block/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..44c8b58a2f00125d797323277885184946540043
Binary files /dev/null and b/app/code/BobGroup/BobGo/Block/.DS_Store differ
diff --git a/Block/System/Config/Form/Field/Version.php b/app/code/BobGroup/BobGo/Block/System/Config/Form/Field/Version.php
similarity index 100%
rename from Block/System/Config/Form/Field/Version.php
rename to app/code/BobGroup/BobGo/Block/System/Config/Form/Field/Version.php
diff --git a/Helper/Data.php b/app/code/BobGroup/BobGo/Helper/Data.php
similarity index 100%
rename from Helper/Data.php
rename to app/code/BobGroup/BobGo/Helper/Data.php
diff --git a/Model/Carrier/AdditionalInfo.php b/app/code/BobGroup/BobGo/Model/Carrier/AdditionalInfo.php
similarity index 100%
rename from Model/Carrier/AdditionalInfo.php
rename to app/code/BobGroup/BobGo/Model/Carrier/AdditionalInfo.php
diff --git a/Model/Carrier/BobGo.php b/app/code/BobGroup/BobGo/Model/Carrier/BobGo.php
similarity index 100%
rename from Model/Carrier/BobGo.php
rename to app/code/BobGroup/BobGo/Model/Carrier/BobGo.php
diff --git a/Model/Carrier/uData.php b/app/code/BobGroup/BobGo/Model/Carrier/uData.php
similarity index 100%
rename from Model/Carrier/uData.php
rename to app/code/BobGroup/BobGo/Model/Carrier/uData.php
diff --git a/Model/Carrier/uSubs.php b/app/code/BobGroup/BobGo/Model/Carrier/uSubs.php
similarity index 100%
rename from Model/Carrier/uSubs.php
rename to app/code/BobGroup/BobGo/Model/Carrier/uSubs.php
diff --git a/Model/Source/Dropoff.php b/app/code/BobGroup/BobGo/Model/Source/Dropoff.php
similarity index 100%
rename from Model/Source/Dropoff.php
rename to app/code/BobGroup/BobGo/Model/Source/Dropoff.php
diff --git a/Model/Source/Freemethod.php b/app/code/BobGroup/BobGo/Model/Source/Freemethod.php
similarity index 100%
rename from Model/Source/Freemethod.php
rename to app/code/BobGroup/BobGo/Model/Source/Freemethod.php
diff --git a/Model/Source/Generic.php b/app/code/BobGroup/BobGo/Model/Source/Generic.php
similarity index 100%
rename from Model/Source/Generic.php
rename to app/code/BobGroup/BobGo/Model/Source/Generic.php
diff --git a/Model/Source/Method.php b/app/code/BobGroup/BobGo/Model/Source/Method.php
similarity index 100%
rename from Model/Source/Method.php
rename to app/code/BobGroup/BobGo/Model/Source/Method.php
diff --git a/Model/Source/Packaging.php b/app/code/BobGroup/BobGo/Model/Source/Packaging.php
similarity index 100%
rename from Model/Source/Packaging.php
rename to app/code/BobGroup/BobGo/Model/Source/Packaging.php
diff --git a/Model/Source/Unitofmeasure.php b/app/code/BobGroup/BobGo/Model/Source/Unitofmeasure.php
similarity index 100%
rename from Model/Source/Unitofmeasure.php
rename to app/code/BobGroup/BobGo/Model/Source/Unitofmeasure.php
diff --git a/Plugin/Block/DataProviders/Tracking/ChangeTitle.php b/app/code/BobGroup/BobGo/Plugin/Block/DataProviders/Tracking/ChangeTitle.php
similarity index 100%
rename from Plugin/Block/DataProviders/Tracking/ChangeTitle.php
rename to app/code/BobGroup/BobGo/Plugin/Block/DataProviders/Tracking/ChangeTitle.php
diff --git a/Plugin/Block/Tracking/PopUpDeliveryDate.php b/app/code/BobGroup/BobGo/Plugin/Block/Tracking/PopUpDeliveryDate.php
similarity index 100%
rename from Plugin/Block/Tracking/PopUpDeliveryDate.php
rename to app/code/BobGroup/BobGo/Plugin/Block/Tracking/PopUpDeliveryDate.php
diff --git a/Plugin/Checkout/Block/LayoutProcessorPlugin.php b/app/code/BobGroup/BobGo/Plugin/Checkout/Block/LayoutProcessorPlugin.php
similarity index 100%
rename from Plugin/Checkout/Block/LayoutProcessorPlugin.php
rename to app/code/BobGroup/BobGo/Plugin/Checkout/Block/LayoutProcessorPlugin.php
diff --git a/Readme.md b/app/code/BobGroup/BobGo/Readme.md
similarity index 100%
rename from Readme.md
rename to app/code/BobGroup/BobGo/Readme.md
diff --git a/composer.json b/app/code/BobGroup/BobGo/composer.json
similarity index 100%
rename from composer.json
rename to app/code/BobGroup/BobGo/composer.json
diff --git a/composer.lock b/app/code/BobGroup/BobGo/composer.lock
similarity index 100%
rename from composer.lock
rename to app/code/BobGroup/BobGo/composer.lock
diff --git a/app/code/BobGroup/BobGo/etc/acl.xml b/app/code/BobGroup/BobGo/etc/acl.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c5d9fc04d08878cd8b7d0f9cae874d964eaf8269
--- /dev/null
+++ b/app/code/BobGroup/BobGo/etc/acl.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Config::config">
+                    <resource id="BobGroup_BobGo::config" title="Bob Go Config" sortOrder="10"/>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/etc/adminhtml/system.xml b/app/code/BobGroup/BobGo/etc/adminhtml/system.xml
similarity index 85%
rename from etc/adminhtml/system.xml
rename to app/code/BobGroup/BobGo/etc/adminhtml/system.xml
index eb0eb24b0b54eb433446868d4b7c6377c07908bd..8c11255bf2714a7d282b6e1d34bb8e77604fb615 100644
--- a/etc/adminhtml/system.xml
+++ b/app/code/BobGroup/BobGo/etc/adminhtml/system.xml
@@ -4,13 +4,8 @@
         <section id="carriers" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
             <group id="bobgo" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Bob Go</label>
-                <field id="version" translate="label" type="label" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Version</label>
-                    <frontend_model>BobGroup\BobGo\Block\System\Config\Form\Field\Version</frontend_model>
-                </field>
                 <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Show rates for checkout</label>
-                    <comment>When this setting is enabled, your customers will be presented with shipping rates at checkout, as configured on the Bob Go platform under Rates at checkout.</comment>
+                    <label>Enable Extension</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="specificerrmsg" translate="label" type="textarea" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/etc/config.xml b/app/code/BobGroup/BobGo/etc/config.xml
similarity index 100%
rename from etc/config.xml
rename to app/code/BobGroup/BobGo/etc/config.xml
diff --git a/etc/extension_attributes.xml b/app/code/BobGroup/BobGo/etc/extension_attributes.xml
similarity index 100%
rename from etc/extension_attributes.xml
rename to app/code/BobGroup/BobGo/etc/extension_attributes.xml
diff --git a/etc/frontend/di.xml b/app/code/BobGroup/BobGo/etc/frontend/di.xml
similarity index 100%
rename from etc/frontend/di.xml
rename to app/code/BobGroup/BobGo/etc/frontend/di.xml
diff --git a/etc/module.xml b/app/code/BobGroup/BobGo/etc/module.xml
similarity index 100%
rename from etc/module.xml
rename to app/code/BobGroup/BobGo/etc/module.xml
diff --git a/i18n/en_US.csv b/app/code/BobGroup/BobGo/i18n/en_US.csv
similarity index 100%
rename from i18n/en_US.csv
rename to app/code/BobGroup/BobGo/i18n/en_US.csv
diff --git a/registration.php b/app/code/BobGroup/BobGo/registration.php
similarity index 100%
rename from registration.php
rename to app/code/BobGroup/BobGo/registration.php
diff --git a/view/frontend/layout/checkout_cart_index.xml b/app/code/BobGroup/BobGo/view/frontend/layout/checkout_cart_index.xml
similarity index 100%
rename from view/frontend/layout/checkout_cart_index.xml
rename to app/code/BobGroup/BobGo/view/frontend/layout/checkout_cart_index.xml
diff --git a/view/frontend/layout/checkout_index_index.xml b/app/code/BobGroup/BobGo/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from view/frontend/layout/checkout_index_index.xml
rename to app/code/BobGroup/BobGo/view/frontend/layout/checkout_index_index.xml
diff --git a/view/frontend/requirejs-config.js b/app/code/BobGroup/BobGo/view/frontend/requirejs-config.js
similarity index 100%
rename from view/frontend/requirejs-config.js
rename to app/code/BobGroup/BobGo/view/frontend/requirejs-config.js
diff --git a/view/frontend/web/js/action/set-shipping-information-mixin.js b/app/code/BobGroup/BobGo/view/frontend/web/js/action/set-shipping-information-mixin.js
similarity index 100%
rename from view/frontend/web/js/action/set-shipping-information-mixin.js
rename to app/code/BobGroup/BobGo/view/frontend/web/js/action/set-shipping-information-mixin.js
diff --git a/view/frontend/web/js/model/set-shipping-information.js b/app/code/BobGroup/BobGo/view/frontend/web/js/model/set-shipping-information.js
similarity index 100%
rename from view/frontend/web/js/model/set-shipping-information.js
rename to app/code/BobGroup/BobGo/view/frontend/web/js/model/set-shipping-information.js
diff --git a/view/frontend/web/js/model/shipping-rates-validation-rules.js b/app/code/BobGroup/BobGo/view/frontend/web/js/model/shipping-rates-validation-rules.js
similarity index 100%
rename from view/frontend/web/js/model/shipping-rates-validation-rules.js
rename to app/code/BobGroup/BobGo/view/frontend/web/js/model/shipping-rates-validation-rules.js
diff --git a/view/frontend/web/js/model/shipping-rates-validator.js b/app/code/BobGroup/BobGo/view/frontend/web/js/model/shipping-rates-validator.js
similarity index 100%
rename from view/frontend/web/js/model/shipping-rates-validator.js
rename to app/code/BobGroup/BobGo/view/frontend/web/js/model/shipping-rates-validator.js
diff --git a/view/frontend/web/js/view/shipping-rates-validation.js b/app/code/BobGroup/BobGo/view/frontend/web/js/view/shipping-rates-validation.js
similarity index 100%
rename from view/frontend/web/js/view/shipping-rates-validation.js
rename to app/code/BobGroup/BobGo/view/frontend/web/js/view/shipping-rates-validation.js