diff --git a/scrapy/__init__.py b/scrapy/__init__.py
index b873829a8..795e92d02 100644
--- a/scrapy/__init__.py
+++ b/scrapy/__init__.py
@@ -12,8 +12,8 @@ if sys.version_info < (2,5):
     sys.exit(1)
 
 # monkey patches to fix external library issues
-from scrapy.patches import monkeypatches
-monkeypatches.apply_patches()
+from scrapy.patches import apply_patches
+apply_patches()
 
 # optional_features is a set containing Scrapy optional features
 optional_features = set()
diff --git a/scrapy/extension/__init__.py b/scrapy/extension.py
similarity index 100%
rename from scrapy/extension/__init__.py
rename to scrapy/extension.py
diff --git a/scrapy/fetcher/__init__.py b/scrapy/fetcher.py
similarity index 100%
rename from scrapy/fetcher/__init__.py
rename to scrapy/fetcher.py
diff --git a/scrapy/log/__init__.py b/scrapy/log.py
similarity index 100%
rename from scrapy/log/__init__.py
rename to scrapy/log.py
diff --git a/scrapy/mail/__init__.py b/scrapy/mail.py
similarity index 100%
rename from scrapy/mail/__init__.py
rename to scrapy/mail.py
diff --git a/scrapy/patches/monkeypatches.py b/scrapy/patches.py
similarity index 100%
rename from scrapy/patches/monkeypatches.py
rename to scrapy/patches.py
diff --git a/scrapy/patches/__init__.py b/scrapy/patches/__init__.py
deleted file mode 100644
index e69de29bb..000000000