32 files changed, 38 insertions, 38 deletions
diff --git a/lib/puppet/event-loop.rb b/lib/puppet/event-loop.rb
deleted file mode 100644
index 9d98cf0ee..000000000
--- a/lib/puppet/event-loop.rb
+++ /dev/null
@@ -1 +0,0 @@
-require "puppet/event-loop/event-loop"
diff --git a/lib/puppet/base64.rb b/lib/puppet/external/base64.rb
index 4030ad358..4030ad358 100755
--- a/lib/puppet/base64.rb
+++ b/lib/puppet/external/base64.rb
diff --git a/lib/puppet/external/event-loop.rb b/lib/puppet/external/event-loop.rb
new file mode 100644
index 000000000..476fb0ba3
--- /dev/null
+++ b/lib/puppet/external/event-loop.rb
@@ -0,0 +1 @@
+require "puppet/external/event-loop/event-loop"
diff --git a/lib/puppet/event-loop/better-definers.rb b/lib/puppet/external/event-loop/better-definers.rb
index 0af37da62..0af37da62 100644
--- a/lib/puppet/event-loop/better-definers.rb
+++ b/lib/puppet/external/event-loop/better-definers.rb
diff --git a/lib/puppet/event-loop/event-loop.rb b/lib/puppet/external/event-loop/event-loop.rb
index 5d78844ef..6e40d275c 100644
--- a/lib/puppet/event-loop/event-loop.rb
+++ b/lib/puppet/external/event-loop/event-loop.rb
@@ -17,8 +17,8 @@
 # Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-require "puppet/event-loop/better-definers"
-require "puppet/event-loop/signal-system"
+require "puppet/external/event-loop/better-definers"
+require "puppet/external/event-loop/signal-system"
 
 require "fcntl"
 
diff --git a/lib/puppet/event-loop/signal-system.rb b/lib/puppet/external/event-loop/signal-system.rb
index f7fe9b52c..2ca61e2ee 100644
--- a/lib/puppet/event-loop/signal-system.rb
+++ b/lib/puppet/external/event-loop/signal-system.rb
@@ -17,7 +17,7 @@
 # Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-require "puppet/event-loop/better-definers"
+require "puppet/external/event-loop/better-definers"
 
 module SignalEmitterModule
   def self.extended (object)
diff --git a/lib/puppet/gratr.rb b/lib/puppet/external/gratr.rb
index f59315d57..b830caeb4 100644
--- a/lib/puppet/gratr.rb
+++ b/lib/puppet/external/gratr.rb
@@ -27,7 +27,7 @@
 #++
 
 
-require 'puppet/gratr/base'
-require 'puppet/gratr/digraph'
-require 'puppet/gratr/undirected_graph'
-require 'puppet/gratr/common'
+require 'puppet/external/gratr/base'
+require 'puppet/external/gratr/digraph'
+require 'puppet/external/gratr/undirected_graph'
+require 'puppet/external/gratr/common'
diff --git a/lib/puppet/gratr/adjacency_graph.rb b/lib/puppet/external/gratr/adjacency_graph.rb
index a02ed0b2f..b740c4722 100644
--- a/lib/puppet/gratr/adjacency_graph.rb
+++ b/lib/puppet/external/gratr/adjacency_graph.rb
@@ -27,8 +27,8 @@
 #++
 
 
-require 'puppet/gratr/edge'
-require 'puppet/gratr/graph'
+require 'puppet/external/gratr/edge'
+require 'puppet/external/gratr/graph'
 require 'set'
 
 module GRATR
diff --git a/lib/puppet/gratr/base.rb b/lib/puppet/external/gratr/base.rb
index 72dded73f..72dded73f 100644
--- a/lib/puppet/gratr/base.rb
+++ b/lib/puppet/external/gratr/base.rb
diff --git a/lib/puppet/gratr/biconnected.rb b/lib/puppet/external/gratr/biconnected.rb
index c976b2c04..c976b2c04 100644
--- a/lib/puppet/gratr/biconnected.rb
+++ b/lib/puppet/external/gratr/biconnected.rb
diff --git a/lib/puppet/gratr/chinese_postman.rb b/lib/puppet/external/gratr/chinese_postman.rb
index 5a9121e2e..338a88bed 100644
--- a/lib/puppet/gratr/chinese_postman.rb
+++ b/lib/puppet/external/gratr/chinese_postman.rb
@@ -26,7 +26,7 @@
 #++
 
 
-require 'puppet/gratr/digraph_distance'
+require 'puppet/external/gratr/digraph_distance'
 
 module GRATR
   module Graph
@@ -120,4 +120,4 @@ module GRATR
     end # Chinese Postman
   end # Graph
 end # GRATR
-  
-\ No newline at end of file
+  
diff --git a/lib/puppet/gratr/common.rb b/lib/puppet/external/gratr/common.rb
index 72a7ed575..347250edc 100644
--- a/lib/puppet/gratr/common.rb
+++ b/lib/puppet/external/gratr/common.rb
@@ -26,8 +26,8 @@
 #++
 
 
-require 'puppet/gratr/edge'
-require 'puppet/gratr/graph'
+require 'puppet/external/gratr/edge'
+require 'puppet/external/gratr/graph'
 
 module GRATR
   # This class defines a cycle graph of size n
@@ -70,4 +70,4 @@ module GRATR
   
   
   
-end                # GRATR
-\ No newline at end of file
+end                # GRATR
diff --git a/lib/puppet/gratr/comparability.rb b/lib/puppet/external/gratr/comparability.rb
index 1546fbefe..1546fbefe 100644
--- a/lib/puppet/gratr/comparability.rb
+++ b/lib/puppet/external/gratr/comparability.rb
diff --git a/lib/puppet/gratr/digraph.rb b/lib/puppet/external/gratr/digraph.rb
index ae875376d..1223a65a1 100644
--- a/lib/puppet/gratr/digraph.rb
+++ b/lib/puppet/external/gratr/digraph.rb
@@ -26,13 +26,13 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #++
 
-require 'puppet/gratr/edge'
-require 'puppet/gratr/graph'
-require 'puppet/gratr/search'
-require 'puppet/gratr/adjacency_graph'
-require 'puppet/gratr/strong_components'
-require 'puppet/gratr/digraph_distance'
-require 'puppet/gratr/chinese_postman'
+require 'puppet/external/gratr/edge'
+require 'puppet/external/gratr/graph'
+require 'puppet/external/gratr/search'
+require 'puppet/external/gratr/adjacency_graph'
+require 'puppet/external/gratr/strong_components'
+require 'puppet/external/gratr/digraph_distance'
+require 'puppet/external/gratr/chinese_postman'
 
 module GRATR
   #
diff --git a/lib/puppet/gratr/digraph_distance.rb b/lib/puppet/external/gratr/digraph_distance.rb
index 6f90384e7..6f90384e7 100644
--- a/lib/puppet/gratr/digraph_distance.rb
+++ b/lib/puppet/external/gratr/digraph_distance.rb
diff --git a/lib/puppet/gratr/dot.rb b/lib/puppet/external/gratr/dot.rb
index fbf4fb073..5b74776aa 100644
--- a/lib/puppet/gratr/dot.rb
+++ b/lib/puppet/external/gratr/dot.rb
@@ -30,7 +30,7 @@
 # rdot.rb is a modified version which also contains support for undirected
 # graphs.
 
-require 'puppet/gratr/rdot'
+require 'puppet/external/gratr/rdot'
 
 module GRATR
   module Graph
diff --git a/lib/puppet/gratr/edge.rb b/lib/puppet/external/gratr/edge.rb
index 8470e5458..8470e5458 100644
--- a/lib/puppet/gratr/edge.rb
+++ b/lib/puppet/external/gratr/edge.rb
diff --git a/lib/puppet/gratr/graph.rb b/lib/puppet/external/gratr/graph.rb
index 44c8bc4d8..7b73afccc 100644
--- a/lib/puppet/gratr/graph.rb
+++ b/lib/puppet/external/gratr/graph.rb
@@ -27,9 +27,9 @@
 #++
 
 
-require 'puppet/gratr/edge'
-require 'puppet/gratr/labels'
-require 'puppet/gratr/graph_api'
+require 'puppet/external/gratr/edge'
+require 'puppet/external/gratr/labels'
+require 'puppet/external/gratr/graph_api'
 
 module GRATR
   
diff --git a/lib/puppet/gratr/graph_api.rb b/lib/puppet/external/gratr/graph_api.rb
index 26d18958a..26d18958a 100644
--- a/lib/puppet/gratr/graph_api.rb
+++ b/lib/puppet/external/gratr/graph_api.rb
diff --git a/lib/puppet/gratr/import.rb b/lib/puppet/external/gratr/import.rb
index 7be8fb3f3..d3678d8b6 100644
--- a/lib/puppet/gratr/import.rb
+++ b/lib/puppet/external/gratr/import.rb
@@ -26,7 +26,7 @@
 #++
 
 
-require 'puppet/gratr'
+require 'puppet/external/gratr'
 
 # Pull all GRATR classes up into the current namespace
 Edge                  = GRATR::Edge
diff --git a/lib/puppet/gratr/labels.rb b/lib/puppet/external/gratr/labels.rb
index 7e53df404..7e53df404 100644
--- a/lib/puppet/gratr/labels.rb
+++ b/lib/puppet/external/gratr/labels.rb
diff --git a/lib/puppet/gratr/maximum_flow.rb b/lib/puppet/external/gratr/maximum_flow.rb
index 7b3ef9b2f..7b3ef9b2f 100644
--- a/lib/puppet/gratr/maximum_flow.rb
+++ b/lib/puppet/external/gratr/maximum_flow.rb
diff --git a/lib/puppet/gratr/rdot.rb b/lib/puppet/external/gratr/rdot.rb
index 4ce545ae6..4ce545ae6 100644
--- a/lib/puppet/gratr/rdot.rb
+++ b/lib/puppet/external/gratr/rdot.rb
diff --git a/lib/puppet/gratr/search.rb b/lib/puppet/external/gratr/search.rb
index 3206ec5d9..3206ec5d9 100644
--- a/lib/puppet/gratr/search.rb
+++ b/lib/puppet/external/gratr/search.rb
diff --git a/lib/puppet/gratr/strong_components.rb b/lib/puppet/external/gratr/strong_components.rb
index 796ae16bb..796ae16bb 100644
--- a/lib/puppet/gratr/strong_components.rb
+++ b/lib/puppet/external/gratr/strong_components.rb
diff --git a/lib/puppet/gratr/undirected_graph.rb b/lib/puppet/external/gratr/undirected_graph.rb
index e96b0f351..86963d27c 100644
--- a/lib/puppet/gratr/undirected_graph.rb
+++ b/lib/puppet/external/gratr/undirected_graph.rb
@@ -27,10 +27,10 @@
 #++
 
 
-require 'puppet/gratr/adjacency_graph'
-require 'puppet/gratr/search'
-require 'puppet/gratr/biconnected'
-require 'puppet/gratr/comparability'
+require 'puppet/external/gratr/adjacency_graph'
+require 'puppet/external/gratr/search'
+require 'puppet/external/gratr/biconnected'
+require 'puppet/external/gratr/comparability'
 require 'set'
 
 module GRATR
diff --git a/lib/puppet/lock.rb b/lib/puppet/external/lock.rb
index d873d1bbf..d873d1bbf 100644
--- a/lib/puppet/lock.rb
+++ b/lib/puppet/external/lock.rb
diff --git a/lib/puppet/networkclient.rb b/lib/puppet/networkclient.rb
index c419431be..8951c3ccb 100644
--- a/lib/puppet/networkclient.rb
+++ b/lib/puppet/networkclient.rb
@@ -8,7 +8,7 @@ require 'puppet/transportable'
 require 'puppet/metric'
 require 'puppet/daemon'
 require 'puppet/server'
-require 'puppet/base64'
+require 'puppet/external/base64'
 
 $noclientnetworking = false
 begin
diff --git a/lib/puppet/pgraph.rb b/lib/puppet/pgraph.rb
index f247f4391..af8e720cb 100644
--- a/lib/puppet/pgraph.rb
+++ b/lib/puppet/pgraph.rb
@@ -3,9 +3,9 @@
 #  Created by Luke A. Kanies on 2006-11-24.
 #  Copyright (c) 2006. All rights reserved.
 
-require 'puppet/gratr/digraph'
-require 'puppet/gratr/import'
-require 'puppet/gratr/dot'
+require 'puppet/external/gratr/digraph'
+require 'puppet/external/gratr/import'
+require 'puppet/external/gratr/dot'
 require 'puppet/relationship'
 
 # This class subclasses a graph class in order to handle relationships
diff --git a/lib/puppet/relationship.rb b/lib/puppet/relationship.rb
index 15f67b384..c848340d7 100644
--- a/lib/puppet/relationship.rb
+++ b/lib/puppet/relationship.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2006-11-24.
 #  Copyright (c) 2006. All rights reserved.
 
-require 'puppet/gratr'
+require 'puppet/external/gratr'
 
 # subscriptions are permanent associations determining how different
 # objects react to an event
diff --git a/lib/puppet/server/filebucket.rb b/lib/puppet/server/filebucket.rb
index 020c42518..56d994366 100755
--- a/lib/puppet/server/filebucket.rb
+++ b/lib/puppet/server/filebucket.rb
@@ -7,7 +7,7 @@ require 'xmlrpc/server'
 require 'xmlrpc/client'
 require 'facter'
 require 'digest/md5'
-require 'puppet/base64'
+require 'puppet/external/base64'
 
 module Puppet
 class Server
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
index 9e40251e2..1242372ac 100644
--- a/lib/puppet/util.rb
+++ b/lib/puppet/util.rb
@@ -1,7 +1,7 @@
 # A module to collect utility functions.
 
 require 'sync'
-require 'puppet/lock'
+require 'puppet/external/lock'
 
 module Puppet
     # A command failed to execute.