diff --git a/config/autoload.php b/config/autoload.php
index fe4da78..496e040 100644
--- a/config/autoload.php
+++ b/config/autoload.php
@@ -20,9 +20,13 @@
 	'MadeYourDay\\Contao\\Columns' => 'system/modules/rocksolid-columns/src/MadeYourDay/Contao/Columns.php',
 ));
 
+$templatesFolder = version_compare(VERSION, '4.0', '>=')
+	? 'vendor/madeyourday/contao-rocksolid-columns/templates'
+	: 'system/modules/rocksolid-columns/templates';
+
 TemplateLoader::addFiles(array(
-	'ce_rs_columns_start' => 'system/modules/rocksolid-columns/templates',
-	'ce_rs_columns_stop' => 'system/modules/rocksolid-columns/templates',
-	'ce_rs_column_start' => 'system/modules/rocksolid-columns/templates',
-	'ce_rs_column_stop' => 'system/modules/rocksolid-columns/templates',
+	'ce_rs_columns_start' => $templatesFolder,
+	'ce_rs_columns_stop' => $templatesFolder,
+	'ce_rs_column_start' => $templatesFolder,
+	'ce_rs_column_stop' => $templatesFolder,
 ));
diff --git a/dca/tl_content.php b/dca/tl_content.php
index 90987cd..6ea0c17 100644
--- a/dca/tl_content.php
+++ b/dca/tl_content.php
@@ -13,7 +13,10 @@
  */
 
 if (TL_MODE === 'BE') {
-	$GLOBALS['TL_CSS'][] = 'system/modules/rocksolid-columns/assets/css/be_main.css';
+	$assetsDir = version_compare(VERSION, '4.0', '>=')
+		? 'bundles/rocksolidcolumns'
+		: 'system/modules/rocksolid-columns/assets';
+	$GLOBALS['TL_CSS'][] = $assetsDir . '/css/be_main.css';
 }
 
 $GLOBALS['TL_DCA']['tl_content']['config']['onsubmit_callback'][] = array('MadeYourDay\\Contao\\Columns', 'onsubmitCallback');
diff --git a/src/MadeYourDay/Contao/Columns.php b/src/MadeYourDay/Contao/Columns.php
index 921ae2b..7365ed8 100644
--- a/src/MadeYourDay/Contao/Columns.php
+++ b/src/MadeYourDay/Contao/Columns.php
@@ -28,7 +28,10 @@ class Columns
 	public function generatePageHook(\PageModel $page, \LayoutModel $layout, \PageRegular $pageRegular)
 	{
 		if ($layout->rs_columns_load_css) {
-			$GLOBALS['TL_CSS'][] = 'system/modules/rocksolid-columns/assets/css/columns.css||static';
+			$assetsDir = version_compare(VERSION, '4.0', '>=')
+				? 'web/bundles/rocksolidcolumns'
+				: 'system/modules/rocksolid-columns/assets';
+			$GLOBALS['TL_CSS'][] = $assetsDir . '/css/columns.css||static';
 		}
 	}
 
diff --git a/src/MadeYourDay/Contao/Resources/contao b/src/MadeYourDay/Contao/Resources/contao
new file mode 120000
index 0000000..c866b86
--- /dev/null
+++ b/src/MadeYourDay/Contao/Resources/contao
@@ -0,0 +1 @@
+../../../..
\ No newline at end of file
diff --git a/src/MadeYourDay/Contao/Resources/public b/src/MadeYourDay/Contao/Resources/public
new file mode 120000
index 0000000..2b56518
--- /dev/null
+++ b/src/MadeYourDay/Contao/Resources/public
@@ -0,0 +1 @@
+../../../../assets
\ No newline at end of file
diff --git a/src/MadeYourDay/Contao/RockSolidColumnsBundle.php b/src/MadeYourDay/Contao/RockSolidColumnsBundle.php
new file mode 100644
index 0000000..f4b4f25
--- /dev/null
+++ b/src/MadeYourDay/Contao/RockSolidColumnsBundle.php
@@ -0,0 +1,20 @@
+<?php
+/*
+ * Copyright MADE/YOUR/DAY OG <mail@madeyourday.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MadeYourDay\Contao;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+/**
+ * Configures the RockSolid Columns bundle.
+ *
+ * @author Martin Auswöger <martin@madeyourday.net>
+ */
+class RockSolidColumnsBundle extends Bundle
+{
+}