diff --git a/plugins/bsc/lib/bsc_plugin.rb b/plugins/bsc/lib/bsc_plugin.rb
index d88e5be..b40e55a 100644
--- a/plugins/bsc/lib/bsc_plugin.rb
+++ b/plugins/bsc/lib/bsc_plugin.rb
@@ -1,5 +1,5 @@
-require_dependency 'ext/enterprise'
-require_dependency 'ext/product'
+require_dependency 'bsc_plugin/ext/enterprise'
+require_dependency 'bsc_plugin/ext/product'
 
 class BscPlugin < Noosfero::Plugin
 
diff --git a/plugins/bsc/lib/bsc_plugin/ext/enterprise.rb b/plugins/bsc/lib/bsc_plugin/ext/enterprise.rb
new file mode 100644
index 0000000..160077c
--- /dev/null
+++ b/plugins/bsc/lib/bsc_plugin/ext/enterprise.rb
@@ -0,0 +1,13 @@
+require_dependency 'enterprise'
+
+class Enterprise
+  belongs_to :bsc, :class_name => 'BscPlugin::Bsc'
+  has_and_belongs_to_many :contracts, :class_name => 'BscPlugin::Contract', :join_table => 'bsc_plugin_contracts_enterprises'
+
+  FIELDS << 'bsc_id'
+  FIELDS << 'enabled'
+  FIELDS << 'validated'
+
+  named_scope :validated, :conditions => {:validated => true}
+  named_scope :not_validated, :conditions => {:validated => false}
+end
diff --git a/plugins/bsc/lib/bsc_plugin/ext/product.rb b/plugins/bsc/lib/bsc_plugin/ext/product.rb
new file mode 100644
index 0000000..d808f48
--- /dev/null
+++ b/plugins/bsc/lib/bsc_plugin/ext/product.rb
@@ -0,0 +1,15 @@
+require_dependency 'product'
+
+class Product
+
+  has_many :sales, :class_name => 'BscPlugin::Sale'
+  has_many :contracts, :through => :sales, :class_name => 'BscPlugin::Contract'
+
+  def bsc
+    enterprise.bsc if enterprise
+  end
+
+  def display_supplier_on_search?
+    false
+  end
+end
diff --git a/plugins/bsc/lib/ext/enterprise.rb b/plugins/bsc/lib/ext/enterprise.rb
deleted file mode 100644
index 160077c..0000000
--- a/plugins/bsc/lib/ext/enterprise.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require_dependency 'enterprise'
-
-class Enterprise
-  belongs_to :bsc, :class_name => 'BscPlugin::Bsc'
-  has_and_belongs_to_many :contracts, :class_name => 'BscPlugin::Contract', :join_table => 'bsc_plugin_contracts_enterprises'
-
-  FIELDS << 'bsc_id'
-  FIELDS << 'enabled'
-  FIELDS << 'validated'
-
-  named_scope :validated, :conditions => {:validated => true}
-  named_scope :not_validated, :conditions => {:validated => false}
-end
diff --git a/plugins/bsc/lib/ext/product.rb b/plugins/bsc/lib/ext/product.rb
deleted file mode 100644
index d808f48..0000000
--- a/plugins/bsc/lib/ext/product.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require_dependency 'product'
-
-class Product
-
-  has_many :sales, :class_name => 'BscPlugin::Sale'
-  has_many :contracts, :through => :sales, :class_name => 'BscPlugin::Contract'
-
-  def bsc
-    enterprise.bsc if enterprise
-  end
-
-  def display_supplier_on_search?
-    false
-  end
-end
diff --git a/plugins/shopping_cart/lib/ext/enterprise.rb b/plugins/shopping_cart/lib/ext/enterprise.rb
deleted file mode 100644
index 139a9a5..0000000
--- a/plugins/shopping_cart/lib/ext/enterprise.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_dependency 'enterprise'
-
-class Enterprise
-  has_many :orders, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'seller_id'
-end
diff --git a/plugins/shopping_cart/lib/ext/person.rb b/plugins/shopping_cart/lib/ext/person.rb
deleted file mode 100644
index e01e85b..0000000
--- a/plugins/shopping_cart/lib/ext/person.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require_dependency 'person'
-
-class Person
-  has_many :purchases, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'customer_id'
-end
diff --git a/plugins/shopping_cart/lib/shopping_cart_plugin.rb b/plugins/shopping_cart/lib/shopping_cart_plugin.rb
index 7a30398..1b2071e 100644
--- a/plugins/shopping_cart/lib/shopping_cart_plugin.rb
+++ b/plugins/shopping_cart/lib/shopping_cart_plugin.rb
@@ -1,5 +1,5 @@
-require_dependency 'ext/enterprise'
-require_dependency 'ext/person'
+require_dependency 'shopping_cart_plugin/ext/enterprise'
+require_dependency 'shopping_cart_plugin/ext/person'
 
 class ShoppingCartPlugin < Noosfero::Plugin
 
diff --git a/plugins/shopping_cart/lib/shopping_cart_plugin/ext/enterprise.rb b/plugins/shopping_cart/lib/shopping_cart_plugin/ext/enterprise.rb
new file mode 100644
index 0000000..139a9a5
--- /dev/null
+++ b/plugins/shopping_cart/lib/shopping_cart_plugin/ext/enterprise.rb
@@ -0,0 +1,5 @@
+require_dependency 'enterprise'
+
+class Enterprise
+  has_many :orders, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'seller_id'
+end
diff --git a/plugins/shopping_cart/lib/shopping_cart_plugin/ext/person.rb b/plugins/shopping_cart/lib/shopping_cart_plugin/ext/person.rb
new file mode 100644
index 0000000..e01e85b
--- /dev/null
+++ b/plugins/shopping_cart/lib/shopping_cart_plugin/ext/person.rb
@@ -0,0 +1,5 @@
+require_dependency 'person'
+
+class Person
+  has_many :purchases, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'customer_id'
+end
--
libgit2 0.21.2