diff --git a/app/code/BobGroup/BobGo/Block/System/Config/Form/Field/Version.php b/Block/System/Config/Form/Field/Version.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Block/System/Config/Form/Field/Version.php
rename to Block/System/Config/Form/Field/Version.php
diff --git a/app/code/BobGroup/BobGo/Helper/Data.php b/Helper/Data.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Helper/Data.php
rename to Helper/Data.php
diff --git a/app/code/BobGroup/BobGo/Model/Carrier/AdditionalInfo.php b/Model/Carrier/AdditionalInfo.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Model/Carrier/AdditionalInfo.php
rename to Model/Carrier/AdditionalInfo.php
diff --git a/app/code/BobGroup/BobGo/Model/Carrier/BobGo.php b/Model/Carrier/BobGo.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Model/Carrier/BobGo.php
rename to Model/Carrier/BobGo.php
diff --git a/app/code/BobGroup/BobGo/Model/Carrier/uData.php b/Model/Carrier/uData.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Model/Carrier/uData.php
rename to Model/Carrier/uData.php
diff --git a/app/code/BobGroup/BobGo/Model/Carrier/uSubs.php b/Model/Carrier/uSubs.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Model/Carrier/uSubs.php
rename to Model/Carrier/uSubs.php
diff --git a/app/code/BobGroup/BobGo/Model/Source/Dropoff.php b/Model/Source/Dropoff.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Model/Source/Dropoff.php
rename to Model/Source/Dropoff.php
diff --git a/app/code/BobGroup/BobGo/Model/Source/Freemethod.php b/Model/Source/Freemethod.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Model/Source/Freemethod.php
rename to Model/Source/Freemethod.php
diff --git a/app/code/BobGroup/BobGo/Model/Source/Generic.php b/Model/Source/Generic.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Model/Source/Generic.php
rename to Model/Source/Generic.php
diff --git a/app/code/BobGroup/BobGo/Model/Source/Method.php b/Model/Source/Method.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Model/Source/Method.php
rename to Model/Source/Method.php
diff --git a/app/code/BobGroup/BobGo/Model/Source/Packaging.php b/Model/Source/Packaging.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Model/Source/Packaging.php
rename to Model/Source/Packaging.php
diff --git a/app/code/BobGroup/BobGo/Model/Source/Unitofmeasure.php b/Model/Source/Unitofmeasure.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Model/Source/Unitofmeasure.php
rename to Model/Source/Unitofmeasure.php
diff --git a/app/code/BobGroup/BobGo/Plugin/Block/DataProviders/Tracking/ChangeTitle.php b/Plugin/Block/DataProviders/Tracking/ChangeTitle.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Plugin/Block/DataProviders/Tracking/ChangeTitle.php
rename to Plugin/Block/DataProviders/Tracking/ChangeTitle.php
diff --git a/app/code/BobGroup/BobGo/Plugin/Block/Tracking/PopUpDeliveryDate.php b/Plugin/Block/Tracking/PopUpDeliveryDate.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Plugin/Block/Tracking/PopUpDeliveryDate.php
rename to Plugin/Block/Tracking/PopUpDeliveryDate.php
diff --git a/app/code/BobGroup/BobGo/Plugin/Checkout/Block/LayoutProcessorPlugin.php b/Plugin/Checkout/Block/LayoutProcessorPlugin.php
similarity index 100%
rename from app/code/BobGroup/BobGo/Plugin/Checkout/Block/LayoutProcessorPlugin.php
rename to Plugin/Checkout/Block/LayoutProcessorPlugin.php
diff --git a/app/code/BobGroup/BobGo/Readme.md b/Readme.md
similarity index 100%
rename from app/code/BobGroup/BobGo/Readme.md
rename to Readme.md
diff --git a/app/.DS_Store b/app/.DS_Store
deleted file mode 100644
index a46730910c490445066f7a49276962d49d7444e5..0000000000000000000000000000000000000000
Binary files a/app/.DS_Store and /dev/null differ
diff --git a/app/code/.DS_Store b/app/code/.DS_Store
deleted file mode 100644
index 97d3c73c67e7e21804b046607cbee3405af41385..0000000000000000000000000000000000000000
Binary files a/app/code/.DS_Store and /dev/null differ
diff --git a/app/code/BobGroup/.DS_Store b/app/code/BobGroup/.DS_Store
deleted file mode 100644
index 778d09bc4dd9897be93f35a8950ffaf2f248203c..0000000000000000000000000000000000000000
Binary files a/app/code/BobGroup/.DS_Store and /dev/null differ
diff --git a/app/code/BobGroup/BobGo/.DS_Store b/app/code/BobGroup/BobGo/.DS_Store
deleted file mode 100644
index 8d6d369e973c993a56c23259df6f2b1e363afe16..0000000000000000000000000000000000000000
Binary files a/app/code/BobGroup/BobGo/.DS_Store and /dev/null differ
diff --git a/app/code/BobGroup/BobGo/Block/.DS_Store b/app/code/BobGroup/BobGo/Block/.DS_Store
deleted file mode 100644
index 44c8b58a2f00125d797323277885184946540043..0000000000000000000000000000000000000000
Binary files a/app/code/BobGroup/BobGo/Block/.DS_Store and /dev/null differ
diff --git a/app/code/BobGroup/BobGo/composer.json b/composer.json
similarity index 100%
rename from app/code/BobGroup/BobGo/composer.json
rename to composer.json
diff --git a/app/code/BobGroup/BobGo/composer.lock b/composer.lock
similarity index 100%
rename from app/code/BobGroup/BobGo/composer.lock
rename to composer.lock
diff --git a/app/code/BobGroup/BobGo/etc/acl.xml b/etc/acl.xml
similarity index 100%
rename from app/code/BobGroup/BobGo/etc/acl.xml
rename to etc/acl.xml
diff --git a/app/code/BobGroup/BobGo/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
similarity index 100%
rename from app/code/BobGroup/BobGo/etc/adminhtml/system.xml
rename to etc/adminhtml/system.xml
diff --git a/app/code/BobGroup/BobGo/etc/config.xml b/etc/config.xml
similarity index 100%
rename from app/code/BobGroup/BobGo/etc/config.xml
rename to etc/config.xml
diff --git a/app/code/BobGroup/BobGo/etc/extension_attributes.xml b/etc/extension_attributes.xml
similarity index 100%
rename from app/code/BobGroup/BobGo/etc/extension_attributes.xml
rename to etc/extension_attributes.xml
diff --git a/app/code/BobGroup/BobGo/etc/frontend/di.xml b/etc/frontend/di.xml
similarity index 100%
rename from app/code/BobGroup/BobGo/etc/frontend/di.xml
rename to etc/frontend/di.xml
diff --git a/app/code/BobGroup/BobGo/etc/module.xml b/etc/module.xml
similarity index 100%
rename from app/code/BobGroup/BobGo/etc/module.xml
rename to etc/module.xml
diff --git a/app/code/BobGroup/BobGo/i18n/en_US.csv b/i18n/en_US.csv
similarity index 100%
rename from app/code/BobGroup/BobGo/i18n/en_US.csv
rename to i18n/en_US.csv
diff --git a/app/code/BobGroup/BobGo/registration.php b/registration.php
similarity index 100%
rename from app/code/BobGroup/BobGo/registration.php
rename to registration.php
diff --git a/app/code/BobGroup/BobGo/view/frontend/layout/checkout_cart_index.xml b/view/frontend/layout/checkout_cart_index.xml
similarity index 100%
rename from app/code/BobGroup/BobGo/view/frontend/layout/checkout_cart_index.xml
rename to view/frontend/layout/checkout_cart_index.xml
diff --git a/app/code/BobGroup/BobGo/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
similarity index 100%
rename from app/code/BobGroup/BobGo/view/frontend/layout/checkout_index_index.xml
rename to view/frontend/layout/checkout_index_index.xml
diff --git a/app/code/BobGroup/BobGo/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
similarity index 100%
rename from app/code/BobGroup/BobGo/view/frontend/requirejs-config.js
rename to view/frontend/requirejs-config.js
diff --git a/app/code/BobGroup/BobGo/view/frontend/web/js/action/set-shipping-information-mixin.js b/view/frontend/web/js/action/set-shipping-information-mixin.js
similarity index 100%
rename from app/code/BobGroup/BobGo/view/frontend/web/js/action/set-shipping-information-mixin.js
rename to view/frontend/web/js/action/set-shipping-information-mixin.js
diff --git a/app/code/BobGroup/BobGo/view/frontend/web/js/model/set-shipping-information.js b/view/frontend/web/js/model/set-shipping-information.js
similarity index 100%
rename from app/code/BobGroup/BobGo/view/frontend/web/js/model/set-shipping-information.js
rename to view/frontend/web/js/model/set-shipping-information.js
diff --git a/app/code/BobGroup/BobGo/view/frontend/web/js/model/shipping-rates-validation-rules.js b/view/frontend/web/js/model/shipping-rates-validation-rules.js
similarity index 100%
rename from app/code/BobGroup/BobGo/view/frontend/web/js/model/shipping-rates-validation-rules.js
rename to view/frontend/web/js/model/shipping-rates-validation-rules.js
diff --git a/app/code/BobGroup/BobGo/view/frontend/web/js/model/shipping-rates-validator.js b/view/frontend/web/js/model/shipping-rates-validator.js
similarity index 100%
rename from app/code/BobGroup/BobGo/view/frontend/web/js/model/shipping-rates-validator.js
rename to view/frontend/web/js/model/shipping-rates-validator.js
diff --git a/app/code/BobGroup/BobGo/view/frontend/web/js/view/shipping-rates-validation.js b/view/frontend/web/js/view/shipping-rates-validation.js
similarity index 100%
rename from app/code/BobGroup/BobGo/view/frontend/web/js/view/shipping-rates-validation.js
rename to view/frontend/web/js/view/shipping-rates-validation.js