diff --git a/lib/wayback_machine_downloader/archive_api.rb b/lib/wayback_machine_downloader/archive_api.rb
index f87c6f6..489429b 100644
--- a/lib/wayback_machine_downloader/archive_api.rb
+++ b/lib/wayback_machine_downloader/archive_api.rb
@@ -1,4 +1,6 @@
-module ArchiveAPI
+class WaybackMachineDownloader; end
+
+module WaybackMachineDownloader::ArchiveAPI
 
   def get_raw_list_from_api url, page_index
     request_url = "http://web.archive.org/cdx/search/xd?url="
diff --git a/lib/wayback_machine_downloader/tidy_bytes.rb b/lib/wayback_machine_downloader/tidy_bytes.rb
index ba000b4..b94f826 100644
--- a/lib/wayback_machine_downloader/tidy_bytes.rb
+++ b/lib/wayback_machine_downloader/tidy_bytes.rb
@@ -1,4 +1,6 @@
-module TibyBytes
+class WaybackMachineDownloader; end
+
+module WaybackMachineDownloader::TidyBytes
 
   # CP-1252 decimal byte => UTF-8 approximation as an array of bytes
   CP1252 = {
@@ -111,12 +113,12 @@ def tidy_bytes!(force = false)
     private
 
     def tidy_byte(byte)
-      byte < 160 ? TibyBytes::CP1252[byte] : byte < 192 ? [194, byte] : [195, byte - 64]
+      byte < 160 ? CP1252[byte] : byte < 192 ? [194, byte] : [195, byte - 64]
     end
 
   end
 end
 
 class String
-  include TibyBytes::StringMixin
+  include WaybackMachineDownloader::TidyBytes::StringMixin
 end
diff --git a/lib/wayback_machine_downloader/to_regex.rb b/lib/wayback_machine_downloader/to_regex.rb
index d9f0a67..de28099 100644
--- a/lib/wayback_machine_downloader/to_regex.rb
+++ b/lib/wayback_machine_downloader/to_regex.rb
@@ -1,4 +1,6 @@
-module ToRegex
+class WaybackMachineDownloader; end
+
+module WaybackMachineDownloader::ToRegex
   module StringMixin
     class << self
       def literal?(str)
@@ -77,5 +79,5 @@ def as_regexp(options = {})
 end
 
 class String
-  include ToRegex::StringMixin
+  include WaybackMachineDownloader::ToRegex::StringMixin
 end