diff --git a/woocommerce.php b/woocommerce.php
deleted file mode 100644
index e04b2ab..0000000
--- a/woocommerce.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * The template for displaying all pages.
- *
- * This is the template that displays all pages by default.
- * Please note that this is the WordPress construct of pages
- * and that other 'pages' on your WordPress site will use a
- * different template.
- *
- * @package understrap
- */
-
- get_header();
-?>
-
-<?php
-$container = get_theme_mod('understrap_container_type');
-$sidebar_pos = get_theme_mod('understrap_sidebar_position');
-?>
-
-<div class="wrapper" id="woocommerce-wrapper">
-
-  <div class="<?php echo $container?>" id="content" tabindex="-1">
-
-      <!-- Do the left sidebar check -->
-      <?php get_template_part( 'global-templates/left-sidebar-check', 'none' ); ?>
-
-      <main class="site-main" id="main">
-
-        <!-- The WooCommerce loop -->
-
-        <?php
-          if (is_singular('product')) {
-
-            woocommerce_content();
-
-          } else {
-
-            //For ANY product archive.
-            //Product taxonomy, product search or /shop landing page etc.
-              wc_get_template('archive-product.php');
-
-          }
-        ?>
-
-      </main><!-- #main -->
-
-    </div><!-- #primary -->
-
-      <!-- Do the right sidebar check -->
-      <?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ): ?>
-      
-        <?php get_sidebar( 'right' ); ?>
-      
-      <?php endif; ?>
-
-  </div><!-- Container end -->
-
-</div><!-- Wrapper end -->
-
-<?php get_footer(); ?>
diff --git a/woocommerce/archive-product.php b/woocommerce/archive-product.php
new file mode 100755
index 0000000..13ada76
--- /dev/null
+++ b/woocommerce/archive-product.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * The Template for displaying product archives, including the main shop page which is a post type archive
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/archive-product.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see 	    https://docs.woocommerce.com/document/template-structure/
+ * @author 		WooThemes
+ * @package 	WooCommerce/Templates
+ * @version     2.0.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+get_header( 'shop' ); ?>
+
+	<?php
+		/**
+		 * woocommerce_before_main_content hook.
+		 *
+		 * @hooked woocommerce_output_content_wrapper - 10 (outputs opening divs for the content)
+		 * @hooked woocommerce_breadcrumb - 20
+		 */
+		do_action( 'woocommerce_before_main_content' );
+	?>
+
+		<?php if ( apply_filters( 'woocommerce_show_page_title', true ) ) : ?>
+
+			<h1 class="page-title"><?php woocommerce_page_title(); ?></h1>
+
+		<?php endif; ?>
+
+		<?php
+			/**
+			 * woocommerce_archive_description hook.
+			 *
+			 * @hooked woocommerce_taxonomy_archive_description - 10
+			 * @hooked woocommerce_product_archive_description - 10
+			 */
+			do_action( 'woocommerce_archive_description' );
+		?>
+
+		<?php if ( have_posts() ) : ?>
+
+			<?php
+				/**
+				 * woocommerce_before_shop_loop hook.
+				 *
+				 * @hooked woocommerce_result_count - 20
+				 * @hooked woocommerce_catalog_ordering - 30
+				 */
+				do_action( 'woocommerce_before_shop_loop' );
+			?>
+
+			<?php woocommerce_product_loop_start(); ?>
+
+				<?php woocommerce_product_subcategories(); ?>
+
+				<?php while ( have_posts() ) : the_post(); ?>
+
+					<?php wc_get_template_part( 'content', 'product' ); ?>
+
+				<?php endwhile; // end of the loop. ?>
+
+			<?php woocommerce_product_loop_end(); ?>
+
+			<?php
+				/**
+				 * woocommerce_after_shop_loop hook.
+				 *
+				 * @hooked woocommerce_pagination - 10
+				 */
+				do_action( 'woocommerce_after_shop_loop' );
+			?>
+
+		<?php elseif ( ! woocommerce_product_subcategories( array( 'before' => woocommerce_product_loop_start( false ), 'after' => woocommerce_product_loop_end( false ) ) ) ) : ?>
+
+			<?php wc_get_template( 'loop/no-products-found.php' ); ?>
+
+		<?php endif; ?>
+
+	<?php
+		/**
+		 * woocommerce_after_main_content hook.
+		 *
+		 * @hooked woocommerce_output_content_wrapper_end - 10 (outputs closing divs for the content)
+		 */
+		do_action( 'woocommerce_after_main_content' );
+	?>
+
+	<?php
+		/**
+		 * woocommerce_sidebar hook.
+		 *
+		 * @hooked woocommerce_get_sidebar - 10
+		 */
+		do_action( 'woocommerce_sidebar' );
+	?>
+
+<?php get_footer( 'shop' ); ?>
diff --git a/woocommerce/global/wrapper-end.php b/woocommerce/global/wrapper-end.php
new file mode 100644
index 0000000..d788f46
--- /dev/null
+++ b/woocommerce/global/wrapper-end.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Content wrappers
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/global/wrapper-end.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see        https://docs.woocommerce.com/document/template-structure/
+ * @author        WooThemes
+ * @package    WooCommerce/Templates
+ * @version     1.6.4
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+?>
+</div></div></div>
diff --git a/woocommerce/global/wrapper-start.php b/woocommerce/global/wrapper-start.php
new file mode 100644
index 0000000..cb8a5ff
--- /dev/null
+++ b/woocommerce/global/wrapper-start.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Content wrappers
+ *
+ * This template can be overridden by copying it to yourtheme/woocommerce/global/wrapper-start.php.
+ *
+ * HOWEVER, on occasion WooCommerce will need to update template files and you
+ * (the theme developer) will need to copy the new files to your theme to
+ * maintain compatibility. We try to do this as little as possible, but it does
+ * happen. When this occurs the version of the template file will be bumped and
+ * the readme will list any important changes.
+ *
+ * @see        https://docs.woocommerce.com/document/template-structure/
+ * @author        WooThemes
+ * @package    WooCommerce/Templates
+ * @version     1.6.4
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+// load container setting
+$container = get_theme_mod( 'understrap_container_type' );
+
+// if we use container-fluid add some margin
+if ( 'container-fluid' === $container ) {
+	echo '<div class="wrapper" id="page-wrapper"><div class="' . $container . '" id="content" tabindex="-1"> <div class="row mx-1">';
+} else {
+	echo '<div class="wrapper" id="page-wrapper"><div class="' . $container . '" id="content" tabindex="-1"> <div class="row">';
+}