From a66cb9e157b690e2ec10715ed82f76d84b705b4a Mon Sep 17 00:00:00 2001
From: phiggins <pete@peterhiggins.org>
Date: Fri, 14 Jan 2011 18:20:52 +0800
Subject: [PATCH] Fix some more broken paths.

---
 lib/fog/compute/models/aws/addresses.rb       | 2 +-
 lib/fog/compute/models/aws/flavors.rb         | 2 +-
 lib/fog/compute/models/aws/images.rb          | 2 +-
 lib/fog/compute/models/aws/key_pairs.rb       | 2 +-
 lib/fog/compute/models/aws/security_groups.rb | 2 +-
 lib/fog/compute/models/aws/servers.rb         | 2 +-
 lib/fog/compute/models/aws/snapshots.rb       | 2 +-
 lib/fog/compute/models/aws/tags.rb            | 2 +-
 lib/fog/compute/models/aws/volumes.rb         | 2 +-
 lib/fog/dns/models/zerigo/records.rb          | 2 +-
 lib/fog/dns/models/zerigo/zone.rb             | 2 +-
 lib/fog/dns/models/zerigo/zones.rb            | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/fog/compute/models/aws/addresses.rb b/lib/fog/compute/models/aws/addresses.rb
index e4414f510..aab7a3bba 100644
--- a/lib/fog/compute/models/aws/addresses.rb
+++ b/lib/fog/compute/models/aws/addresses.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/compute/address'
+require 'fog/compute/models/aws//address'
 
 module Fog
   module AWS
diff --git a/lib/fog/compute/models/aws/flavors.rb b/lib/fog/compute/models/aws/flavors.rb
index 16c8828d9..4c790d52d 100644
--- a/lib/fog/compute/models/aws/flavors.rb
+++ b/lib/fog/compute/models/aws/flavors.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/compute/flavor'
+require 'fog/compute/models/aws/flavor'
 
 module Fog
   module AWS
diff --git a/lib/fog/compute/models/aws/images.rb b/lib/fog/compute/models/aws/images.rb
index 437ec272b..c52a2441c 100644
--- a/lib/fog/compute/models/aws/images.rb
+++ b/lib/fog/compute/models/aws/images.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/compute/image'
+require 'fog/compute/models/aws/image'
 
 module Fog
   module AWS
diff --git a/lib/fog/compute/models/aws/key_pairs.rb b/lib/fog/compute/models/aws/key_pairs.rb
index 31657c2f0..ab90fbf6c 100644
--- a/lib/fog/compute/models/aws/key_pairs.rb
+++ b/lib/fog/compute/models/aws/key_pairs.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/compute/key_pair'
+require 'fog/compute/models/aws/key_pair'
 
 module Fog
   module AWS
diff --git a/lib/fog/compute/models/aws/security_groups.rb b/lib/fog/compute/models/aws/security_groups.rb
index 176a7c5e4..01a3cfd7c 100644
--- a/lib/fog/compute/models/aws/security_groups.rb
+++ b/lib/fog/compute/models/aws/security_groups.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/compute/security_group'
+require 'fog/compute/models/aws/security_group'
 
 module Fog
   module AWS
diff --git a/lib/fog/compute/models/aws/servers.rb b/lib/fog/compute/models/aws/servers.rb
index 173fbe524..62832010a 100644
--- a/lib/fog/compute/models/aws/servers.rb
+++ b/lib/fog/compute/models/aws/servers.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/compute/server'
+require 'fog/compute/models/aws/server'
 
 module Fog
   module AWS
diff --git a/lib/fog/compute/models/aws/snapshots.rb b/lib/fog/compute/models/aws/snapshots.rb
index f532777c6..a8e280b84 100644
--- a/lib/fog/compute/models/aws/snapshots.rb
+++ b/lib/fog/compute/models/aws/snapshots.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/compute/snapshot'
+require 'fog/compute/models/aws/snapshot'
 
 module Fog
   module AWS
diff --git a/lib/fog/compute/models/aws/tags.rb b/lib/fog/compute/models/aws/tags.rb
index 69fe22ea3..09aeb4e76 100644
--- a/lib/fog/compute/models/aws/tags.rb
+++ b/lib/fog/compute/models/aws/tags.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/compute/tag'
+require 'fog/compute/models/aws/tag'
 
 module Fog
   module AWS
diff --git a/lib/fog/compute/models/aws/volumes.rb b/lib/fog/compute/models/aws/volumes.rb
index 9f2a02404..e631b27fd 100644
--- a/lib/fog/compute/models/aws/volumes.rb
+++ b/lib/fog/compute/models/aws/volumes.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/compute/volume'
+require 'fog/compute/models/aws/volume'
 
 module Fog
   module AWS
diff --git a/lib/fog/dns/models/zerigo/records.rb b/lib/fog/dns/models/zerigo/records.rb
index 991fdaeaa..1e25bb8c8 100644
--- a/lib/fog/dns/models/zerigo/records.rb
+++ b/lib/fog/dns/models/zerigo/records.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/zerigo/models/dns/record'
+require 'fog/dns/models/zerigo/record'
 
 module Fog
   module Zerigo
diff --git a/lib/fog/dns/models/zerigo/zone.rb b/lib/fog/dns/models/zerigo/zone.rb
index c5ae581d0..2b3ca4088 100644
--- a/lib/fog/dns/models/zerigo/zone.rb
+++ b/lib/fog/dns/models/zerigo/zone.rb
@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/zerigo/models/dns/records'
+require 'fog/dns/models/zerigo/records'
 
 module Fog
   module Zerigo
diff --git a/lib/fog/dns/models/zerigo/zones.rb b/lib/fog/dns/models/zerigo/zones.rb
index f80dffe80..590706e73 100644
--- a/lib/fog/dns/models/zerigo/zones.rb
+++ b/lib/fog/dns/models/zerigo/zones.rb
@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/zerigo/models/dns/zone'
+require 'fog/dns/models/zerigo/zone'
 
 module Fog
   module Zerigo