diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/config/NovaComputeServiceContextModule.java b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/config/NovaComputeServiceContextModule.java
index ff96dbdfcf..cdac291b8e 100644
--- a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/config/NovaComputeServiceContextModule.java
+++ b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/config/NovaComputeServiceContextModule.java
@@ -18,11 +18,9 @@
  */
 package org.jclouds.openstack.nova.v1_1.compute.config;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.inject.Provides;
-import com.google.inject.name.Names;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import org.jclouds.compute.ComputeServiceAdapter;
 import org.jclouds.compute.config.ComputeServiceAdapterContextModule;
 import org.jclouds.compute.domain.Hardware;
@@ -36,16 +34,22 @@ import org.jclouds.openstack.nova.v1_1.NovaAsyncClient;
 import org.jclouds.openstack.nova.v1_1.NovaClient;
 import org.jclouds.openstack.nova.v1_1.compute.NovaComputeServiceAdapter;
 import org.jclouds.openstack.nova.v1_1.compute.domain.RegionAndName;
-import org.jclouds.openstack.nova.v1_1.compute.functions.*;
+import org.jclouds.openstack.nova.v1_1.compute.functions.FlavorToHardware;
+import org.jclouds.openstack.nova.v1_1.compute.functions.NovaImageToImage;
+import org.jclouds.openstack.nova.v1_1.compute.functions.NovaImageToOperatingSystem;
+import org.jclouds.openstack.nova.v1_1.compute.functions.ServerToNodeMetadata;
+import org.jclouds.openstack.nova.v1_1.compute.loaders.LoadFloatingIpsForInstance;
 import org.jclouds.openstack.nova.v1_1.compute.options.NovaTemplateOptions;
 import org.jclouds.openstack.nova.v1_1.domain.Flavor;
 import org.jclouds.openstack.nova.v1_1.domain.Server;
 
 import com.google.common.base.Function;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.inject.Provides;
 import com.google.inject.TypeLiteral;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
+import com.google.inject.name.Names;
 
 /**
  * Module for building a compute service context for Nova
diff --git a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/LoadFloatingIpsForInstance.java b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstance.java
similarity index 94%
rename from labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/LoadFloatingIpsForInstance.java
rename to labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstance.java
index 183233b266..38f37d11f1 100644
--- a/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/functions/LoadFloatingIpsForInstance.java
+++ b/labs/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstance.java
@@ -16,7 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.openstack.nova.v1_1.compute.functions;
+package org.jclouds.openstack.nova.v1_1.compute.loaders;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jclouds.openstack.nova.v1_1.NovaClient;
+import org.jclouds.openstack.nova.v1_1.compute.domain.RegionAndName;
+import org.jclouds.openstack.nova.v1_1.domain.FloatingIP;
+import org.jclouds.openstack.nova.v1_1.extensions.FloatingIPClient;
 
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
@@ -24,16 +32,6 @@ import com.google.common.base.Predicate;
 import com.google.common.cache.CacheLoader;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
-import org.jclouds.openstack.nova.v1_1.NovaClient;
-import org.jclouds.openstack.nova.v1_1.compute.domain.RegionAndName;
-import org.jclouds.openstack.nova.v1_1.domain.FloatingIP;
-import org.jclouds.openstack.nova.v1_1.extensions.FloatingIPClient;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.NoSuchElementException;
-import java.util.Set;
 
 /**
  * @author Adam Lowe
diff --git a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/LoadFloatingIpsForInstanceTest.java b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstanceTest.java
similarity index 93%
rename from labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/LoadFloatingIpsForInstanceTest.java
rename to labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstanceTest.java
index 6c442d2dfc..9454cc440a 100644
--- a/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/functions/LoadFloatingIpsForInstanceTest.java
+++ b/labs/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/loaders/LoadFloatingIpsForInstanceTest.java
@@ -16,25 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.openstack.nova.v1_1.compute.functions;
+package org.jclouds.openstack.nova.v1_1.compute.loaders;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.testng.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
 
-import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableCollection;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
 import org.jclouds.openstack.nova.v1_1.NovaClient;
 import org.jclouds.openstack.nova.v1_1.compute.domain.RegionAndName;
 import org.jclouds.openstack.nova.v1_1.domain.FloatingIP;
 import org.jclouds.openstack.nova.v1_1.extensions.FloatingIPClient;
 import org.testng.annotations.Test;
 
-import java.util.Set;
-
-import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.*;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.AssertJUnit.assertFalse;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableSet;
 
 /**
  * @author Adam Lowe