diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb
index 2ac179f..cfe10ee 100644
--- a/lib/net/ldap.rb
+++ b/lib/net/ldap.rb
@@ -41,6 +41,9 @@
 
 
 require 'socket'
+require 'net/ber'
+require 'net/ldap/pdu'
+require 'net/ldap/filter'
 
 
 module Net
diff --git a/lib/net/ldapfilter.rb b/lib/net/ldap/filter.rb
similarity index 100%
rename from lib/net/ldapfilter.rb
rename to lib/net/ldap/filter.rb
diff --git a/lib/net/ldappdu.rb b/lib/net/ldap/pdu.rb
similarity index 100%
rename from lib/net/ldappdu.rb
rename to lib/net/ldap/pdu.rb
diff --git a/tests/testber.rb b/tests/testber.rb
index 997499d..a9a6aa7 100644
--- a/tests/testber.rb
+++ b/tests/testber.rb
@@ -5,10 +5,10 @@
 
 $:.unshift "lib"
 
-require 'net/ber'
+#require 'net/ber'
 require 'net/ldap'
-require 'net/ldappdu'
-require 'net/ldapfilter'
+#require 'net/ldap/pdu'
+#require 'net/ldap/filter'
 require 'stringio'
 
 
diff --git a/tests/testldap.rb b/tests/testldap.rb
index fc9f65f..4352b29 100644
--- a/tests/testldap.rb
+++ b/tests/testldap.rb
@@ -5,10 +5,10 @@
 
 $:.unshift "lib"
 
-require 'net/ber'
+#require 'net/ber'
 require 'net/ldap'
-require 'net/ldappdu'
-require 'net/ldapfilter'
+#require 'net/ldap/pdu'
+#require 'net/ldap/filter'
 require 'stringio'
 
 
diff --git a/testserver/ldapserver.rb b/testserver/ldapserver.rb
index 64a495f..e1e946b 100644
--- a/testserver/ldapserver.rb
+++ b/testserver/ldapserver.rb
@@ -190,10 +190,10 @@ if __FILE__ == $0
   $logger.info "adding ../lib to loadpath, to pick up dev version of Net::LDAP."
   $:.unshift "../lib"
 
-  require 'net/ber'
-  require 'net/ldappdu'
+  #require 'net/ber'
   require 'net/ldap'
-  require 'net/ldapfilter'
+  #require 'net/ldap/pdu'
+  #require 'net/ldap/filter'
 
   EventMachine.run {
     $logger.info "starting LDAP server on 127.0.0.1 port 3890"