Index: custom/install/install_data.sql
===================================================================
--- custom/install/install_data.sql	(revision 13106)
+++ custom/install/install_data.sql	(working copy)
@@ -6,7 +6,7 @@
 INSERT INTO Permissions VALUES(DEFAULT, 'custom:widgets.add', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES(DEFAULT, 'custom:widgets.view', 11, 1, 1, 0);
 
-INSERT INTO Modules VALUES ('Custom', 'custom/', 'custom-sections', DEFAULT, 1, 10, 'custom/', 0, NULL);
+INSERT INTO Modules VALUES ('Custom', 'modules/custom/', 'custom-sections', DEFAULT, 1, 10, 'custom/', 0, NULL);
 
 
 # ===== SQLs above this line already on LIVE ================================================================================================
Index: custom/install/upgrades.sql
===================================================================
--- custom/install/upgrades.sql	(revision 13106)
+++ custom/install/upgrades.sql	(working copy)
@@ -11,4 +11,7 @@
 
 # ===== v 1.0.2-RC1 =====
 
-# ===== v 1.0.2 =====
\ No newline at end of file
+# ===== v 1.0.2 =====
+
+# ===== v 1.1.0-B1 =====
+UPDATE Modules SET Path = 'modules/custom/' WHERE `Name` = 'Custom';
\ No newline at end of file
Index: in-auction/install/install_data.sql
===================================================================
--- in-auction/install/install_data.sql	(revision 13106)
+++ in-auction/install/install_data.sql	(working copy)
@@ -1851,4 +1851,4 @@
 INSERT INTO Permissions VALUES (DEFAULT, 'ebay:configuration_feedbacks.edit', 11, 1, 1, 0);
 INSERT INTO Permissions VALUES (DEFAULT, 'ebay:configuration_general.edit', 11, 1, 1, 0);
 
-INSERT INTO Modules VALUES ('In-Auction', 'in-auction/', 'ebay-sections', DEFAULT, 1, 6, 'in-auction/', 2, NULL);
+INSERT INTO Modules VALUES ('In-Auction', 'modules/in-auction/', 'ebay-sections', DEFAULT, 1, 6, 'in-auction/', 2, NULL);
Index: in-auction/install/upgrades.sql
===================================================================
--- in-auction/install/upgrades.sql	(revision 13106)
+++ in-auction/install/upgrades.sql	(working copy)
@@ -43,4 +43,7 @@
 
 # ===== v 5.0.2-RC1 =====
 
-# ===== v 5.0.2 =====
\ No newline at end of file
+# ===== v 5.0.2 =====
+
+# ===== v 5.1.0-B1 =====
+UPDATE Modules SET Path = 'modules/in-auction/' WHERE `Name` = 'In-Auction';
Index: in-bulletin/install/install_data.sql
===================================================================
--- in-bulletin/install/install_data.sql	(revision 13106)
+++ in-bulletin/install/install_data.sql	(working copy)
@@ -282,4 +282,4 @@
 
 INSERT INTO CustomField VALUES (DEFAULT, 1, 'bb_ItemTemplate', 'la_fld_cust_bb_ItemTemplate', 0, 'la_title_SystemCF', 'la_fld_cust_bb_ItemTemplate', 'text', NULL, '', 0, 0, 1, 0);
 
-INSERT INTO Modules VALUES ('In-Bulletin', 'in-bulletin/', 'bb', DEFAULT, 1, 3, 'in-bulletin/', {TopicCatId}, NULL);
+INSERT INTO Modules VALUES ('In-Bulletin', 'modules/in-bulletin/', 'bb', DEFAULT, 1, 3, 'in-bulletin/', {TopicCatId}, NULL);
Index: in-bulletin/install/upgrades.sql
===================================================================
--- in-bulletin/install/upgrades.sql	(revision 13106)
+++ in-bulletin/install/upgrades.sql	(working copy)
@@ -167,4 +167,7 @@
 
 # ===== v 5.0.2-RC1 =====
 
-# ===== v 5.0.2 =====
\ No newline at end of file
+# ===== v 5.0.2 =====
+
+# ===== v 5.1.0-B1 =====
+UPDATE Modules SET Path = 'modules/in-bulletin/' WHERE `Name` = 'In-Bulletin';
\ No newline at end of file
Index: in-commerce/install/install_data.sql
===================================================================
--- in-commerce/install/install_data.sql	(revision 13106)
+++ in-commerce/install/install_data.sql	(working copy)
@@ -582,4 +582,4 @@
 
 INSERT INTO ImportScripts VALUES (DEFAULT, 'Products from CSV file [In-Commerce]', '', 'p', 'In-Commerce', '', 'CSV', '1');
 
-INSERT INTO Modules VALUES ('In-Commerce', 'in-commerce/', 'p', DEFAULT, 1, 4, 'in-commerce/', 2, NULL);
+INSERT INTO Modules VALUES ('In-Commerce', 'modules/in-commerce/', 'p', DEFAULT, 1, 4, 'in-commerce/', 2, NULL);
Index: in-commerce/install/upgrades.sql
===================================================================
--- in-commerce/install/upgrades.sql	(revision 13106)
+++ in-commerce/install/upgrades.sql	(working copy)
@@ -119,4 +119,7 @@
 
 # ===== v 5.0.2-RC1 =====
 
-# ===== v 5.0.2 =====
\ No newline at end of file
+# ===== v 5.0.2 =====
+
+# ===== v 5.1.0-B1 =====
+UPDATE Modules SET Path = 'modules/in-commerce/' WHERE `Name` = 'In-Commerce';
\ No newline at end of file
Index: in-commerce/units/pricing/pricing_event_handler.php
===================================================================
--- in-commerce/units/pricing/pricing_event_handler.php	(revision 13106)
+++ in-commerce/units/pricing/pricing_event_handler.php	(working copy)
@@ -12,7 +12,7 @@
 */
 
 // include globals.php from current folder
-k4_include_once(FULL_PATH.'/in-commerce/units/pricing/globals.php');
+k4_include_once(MODULES_PATH  .'/in-commerce/units/pricing/globals.php');
 
 class PricingEventHandler extends kDBEventHandler {
 
Index: in-link/install/install_data.sql
===================================================================
--- in-link/install/install_data.sql	(revision 13106)
+++ in-link/install/install_data.sql	(working copy)
@@ -302,4 +302,4 @@
 
 INSERT INTO Counters VALUES (DEFAULT, 'linkhits_count', 'SELECT ROUND(SUM(Hits)) FROM <%PREFIX%>Link', NULL, NULL, '300', '0', '|Link|');
 
-INSERT INTO Modules VALUES ('In-Link', 'in-link/', 'l', DEFAULT, 1, 1, 'in-link/', 2, NULL);
+INSERT INTO Modules VALUES ('In-Link', 'modules/in-link/', 'l', DEFAULT, 1, 1, 'in-link/', 2, NULL);
Index: in-link/install/upgrades.sql
===================================================================
--- in-link/install/upgrades.sql	(revision 13106)
+++ in-link/install/upgrades.sql	(working copy)
@@ -61,4 +61,7 @@
 
 # ===== v 5.0.2-RC1 =====
 
-# ===== v 5.0.2 =====
\ No newline at end of file
+# ===== v 5.0.2 =====
+
+# ===== v 5.1.0-B1 =====
+UPDATE Modules SET Path = 'modules/in-link/' WHERE `Name` = 'In-Link';
Index: in-news/install/install_data.sql
===================================================================
--- in-news/install/install_data.sql	(revision 13106)
+++ in-news/install/install_data.sql	(working copy)
@@ -245,4 +245,4 @@
 
 INSERT INTO ImportScripts VALUES (DEFAULT, 'Articles from CSV file [In-News]', '', 'n', 'In-News', '', 'CSV', '1');
 
-INSERT INTO Modules VALUES ('In-News', 'in-news/', 'n', DEFAULT, 1, 2, 'in-news/', {NewsCatId}, NULL);
\ No newline at end of file
+INSERT INTO Modules VALUES ('In-News', 'modules/in-news/', 'n', DEFAULT, 1, 2, 'in-news/', {NewsCatId}, NULL);
\ No newline at end of file
Index: in-news/install/upgrades.sql
===================================================================
--- in-news/install/upgrades.sql	(revision 13106)
+++ in-news/install/upgrades.sql	(working copy)
@@ -61,4 +61,7 @@
 
 # ===== v 5.0.2-RC1 =====
 
-# ===== v 5.0.2 =====
\ No newline at end of file
+# ===== v 5.0.2 =====
+
+# ===== v 5.1.0-B1 =====
+UPDATE Modules SET Path = 'modules/in-news/' WHERE `Name` = 'In-News';