diff --git a/build.properties b/build.properties
index f2a3e11..6bfac26 100644
--- a/build.properties
+++ b/build.properties
@@ -1,8 +1,8 @@
 version=1.0rc2
 lib.dir=lib
-src.dir=src/main/java
-test.dir=src/test/java
-servlet.src.dir=servlet/src/main/java
+src.dir=src
+test.dir=test
+servlet.src.dir=servlet/src
 build.dir=build
 javadoc.packagenames=com.google.inject,com.google.inject.spi,\
   com.google.inject.matcher,com.google.inject.servlet,com.google.inject.name,\
diff --git a/servlet/build.properties b/servlet/build.properties
index ff420ad..56546f0 100644
--- a/servlet/build.properties
+++ b/servlet/build.properties
@@ -1,6 +1,6 @@
 version=1.0rc2
 lib.dir=lib
-src.dir=src/main/java
-test.dir=src/test/java
+src.dir=src
+test.dir=test
 build.dir=build
 test.class=com.google.inject.servlet.ServletTest
diff --git a/servlet/src/main/java/com/google/inject/servlet/GuiceFilter.java b/servlet/src/com/google/inject/servlet/GuiceFilter.java
similarity index 100%
rename from servlet/src/main/java/com/google/inject/servlet/GuiceFilter.java
rename to servlet/src/com/google/inject/servlet/GuiceFilter.java
diff --git a/servlet/src/main/java/com/google/inject/servlet/RequestParameters.java b/servlet/src/com/google/inject/servlet/RequestParameters.java
similarity index 100%
rename from servlet/src/main/java/com/google/inject/servlet/RequestParameters.java
rename to servlet/src/com/google/inject/servlet/RequestParameters.java
diff --git a/servlet/src/main/java/com/google/inject/servlet/RequestScoped.java b/servlet/src/com/google/inject/servlet/RequestScoped.java
similarity index 100%
rename from servlet/src/main/java/com/google/inject/servlet/RequestScoped.java
rename to servlet/src/com/google/inject/servlet/RequestScoped.java
diff --git a/servlet/src/main/java/com/google/inject/servlet/ServletModule.java b/servlet/src/com/google/inject/servlet/ServletModule.java
similarity index 100%
rename from servlet/src/main/java/com/google/inject/servlet/ServletModule.java
rename to servlet/src/com/google/inject/servlet/ServletModule.java
diff --git a/servlet/src/main/java/com/google/inject/servlet/ServletScopes.java b/servlet/src/com/google/inject/servlet/ServletScopes.java
similarity index 100%
rename from servlet/src/main/java/com/google/inject/servlet/ServletScopes.java
rename to servlet/src/com/google/inject/servlet/ServletScopes.java
diff --git a/servlet/src/main/java/com/google/inject/servlet/SessionScoped.java b/servlet/src/com/google/inject/servlet/SessionScoped.java
similarity index 100%
rename from servlet/src/main/java/com/google/inject/servlet/SessionScoped.java
rename to servlet/src/com/google/inject/servlet/SessionScoped.java
diff --git a/servlet/src/main/java/com/google/inject/servlet/package-info.java b/servlet/src/com/google/inject/servlet/package-info.java
similarity index 100%
rename from servlet/src/main/java/com/google/inject/servlet/package-info.java
rename to servlet/src/com/google/inject/servlet/package-info.java
diff --git a/servlet/src/test/java/com/google/inject/servlet/ServletTest.java b/servlet/test/com/google/inject/servlet/ServletTest.java
similarity index 100%
rename from servlet/src/test/java/com/google/inject/servlet/ServletTest.java
rename to servlet/test/com/google/inject/servlet/ServletTest.java
diff --git a/src/main/java/com/google/inject/AbstractErrorHandler.java b/src/com/google/inject/AbstractErrorHandler.java
similarity index 100%
rename from src/main/java/com/google/inject/AbstractErrorHandler.java
rename to src/com/google/inject/AbstractErrorHandler.java
diff --git a/src/main/java/com/google/inject/AbstractModule.java b/src/com/google/inject/AbstractModule.java
similarity index 100%
rename from src/main/java/com/google/inject/AbstractModule.java
rename to src/com/google/inject/AbstractModule.java
diff --git a/src/main/java/com/google/inject/Binder.java b/src/com/google/inject/Binder.java
similarity index 100%
rename from src/main/java/com/google/inject/Binder.java
rename to src/com/google/inject/Binder.java
diff --git a/src/main/java/com/google/inject/BinderImpl.java b/src/com/google/inject/BinderImpl.java
similarity index 100%
rename from src/main/java/com/google/inject/BinderImpl.java
rename to src/com/google/inject/BinderImpl.java
diff --git a/src/main/java/com/google/inject/Binding.java b/src/com/google/inject/Binding.java
similarity index 100%
rename from src/main/java/com/google/inject/Binding.java
rename to src/com/google/inject/Binding.java
diff --git a/src/main/java/com/google/inject/BindingAnnotation.java b/src/com/google/inject/BindingAnnotation.java
similarity index 100%
rename from src/main/java/com/google/inject/BindingAnnotation.java
rename to src/com/google/inject/BindingAnnotation.java
diff --git a/src/main/java/com/google/inject/BindingBuilderImpl.java b/src/com/google/inject/BindingBuilderImpl.java
similarity index 100%
rename from src/main/java/com/google/inject/BindingBuilderImpl.java
rename to src/com/google/inject/BindingBuilderImpl.java
diff --git a/src/main/java/com/google/inject/BindingImpl.java b/src/com/google/inject/BindingImpl.java
similarity index 100%
rename from src/main/java/com/google/inject/BindingImpl.java
rename to src/com/google/inject/BindingImpl.java
diff --git a/src/main/java/com/google/inject/ConfigurationException.java b/src/com/google/inject/ConfigurationException.java
similarity index 100%
rename from src/main/java/com/google/inject/ConfigurationException.java
rename to src/com/google/inject/ConfigurationException.java
diff --git a/src/main/java/com/google/inject/ConstantBindingBuilderImpl.java b/src/com/google/inject/ConstantBindingBuilderImpl.java
similarity index 100%
rename from src/main/java/com/google/inject/ConstantBindingBuilderImpl.java
rename to src/com/google/inject/ConstantBindingBuilderImpl.java
diff --git a/src/main/java/com/google/inject/ConstantConversionException.java b/src/com/google/inject/ConstantConversionException.java
similarity index 100%
rename from src/main/java/com/google/inject/ConstantConversionException.java
rename to src/com/google/inject/ConstantConversionException.java
diff --git a/src/main/java/com/google/inject/ConstantFactory.java b/src/com/google/inject/ConstantFactory.java
similarity index 100%
rename from src/main/java/com/google/inject/ConstantFactory.java
rename to src/com/google/inject/ConstantFactory.java
diff --git a/src/main/java/com/google/inject/ConstructionContext.java b/src/com/google/inject/ConstructionContext.java
similarity index 100%
rename from src/main/java/com/google/inject/ConstructionContext.java
rename to src/com/google/inject/ConstructionContext.java
diff --git a/src/main/java/com/google/inject/ConstructionProxy.java b/src/com/google/inject/ConstructionProxy.java
similarity index 100%
rename from src/main/java/com/google/inject/ConstructionProxy.java
rename to src/com/google/inject/ConstructionProxy.java
diff --git a/src/main/java/com/google/inject/ConstructionProxyFactory.java b/src/com/google/inject/ConstructionProxyFactory.java
similarity index 100%
rename from src/main/java/com/google/inject/ConstructionProxyFactory.java
rename to src/com/google/inject/ConstructionProxyFactory.java
diff --git a/src/main/java/com/google/inject/ConstructorInjector.java b/src/com/google/inject/ConstructorInjector.java
similarity index 100%
rename from src/main/java/com/google/inject/ConstructorInjector.java
rename to src/com/google/inject/ConstructorInjector.java
diff --git a/src/main/java/com/google/inject/Container.java b/src/com/google/inject/Container.java
similarity index 100%
rename from src/main/java/com/google/inject/Container.java
rename to src/com/google/inject/Container.java
diff --git a/src/main/java/com/google/inject/ContainerImpl.java b/src/com/google/inject/ContainerImpl.java
similarity index 100%
rename from src/main/java/com/google/inject/ContainerImpl.java
rename to src/com/google/inject/ContainerImpl.java
diff --git a/src/main/java/com/google/inject/ContainerScoped.java b/src/com/google/inject/ContainerScoped.java
similarity index 100%
rename from src/main/java/com/google/inject/ContainerScoped.java
rename to src/com/google/inject/ContainerScoped.java
diff --git a/src/main/java/com/google/inject/Context.java b/src/com/google/inject/Context.java
similarity index 100%
rename from src/main/java/com/google/inject/Context.java
rename to src/com/google/inject/Context.java
diff --git a/src/main/java/com/google/inject/ContextualCallable.java b/src/com/google/inject/ContextualCallable.java
similarity index 100%
rename from src/main/java/com/google/inject/ContextualCallable.java
rename to src/com/google/inject/ContextualCallable.java
diff --git a/src/main/java/com/google/inject/CreationException.java b/src/com/google/inject/CreationException.java
similarity index 100%
rename from src/main/java/com/google/inject/CreationException.java
rename to src/com/google/inject/CreationException.java
diff --git a/src/main/java/com/google/inject/DefaultConstructionProxyFactory.java b/src/com/google/inject/DefaultConstructionProxyFactory.java
similarity index 100%
rename from src/main/java/com/google/inject/DefaultConstructionProxyFactory.java
rename to src/com/google/inject/DefaultConstructionProxyFactory.java
diff --git a/src/main/java/com/google/inject/ErrorHandler.java b/src/com/google/inject/ErrorHandler.java
similarity index 100%
rename from src/main/java/com/google/inject/ErrorHandler.java
rename to src/com/google/inject/ErrorHandler.java
diff --git a/src/main/java/com/google/inject/ErrorMessages.java b/src/com/google/inject/ErrorMessages.java
similarity index 100%
rename from src/main/java/com/google/inject/ErrorMessages.java
rename to src/com/google/inject/ErrorMessages.java
diff --git a/src/main/java/com/google/inject/ExternalContext.java b/src/com/google/inject/ExternalContext.java
similarity index 100%
rename from src/main/java/com/google/inject/ExternalContext.java
rename to src/com/google/inject/ExternalContext.java
diff --git a/src/main/java/com/google/inject/Guice.java b/src/com/google/inject/Guice.java
similarity index 100%
rename from src/main/java/com/google/inject/Guice.java
rename to src/com/google/inject/Guice.java
diff --git a/src/main/java/com/google/inject/Inject.java b/src/com/google/inject/Inject.java
similarity index 100%
rename from src/main/java/com/google/inject/Inject.java
rename to src/com/google/inject/Inject.java
diff --git a/src/main/java/com/google/inject/InterceptorStackCallback.java b/src/com/google/inject/InterceptorStackCallback.java
similarity index 100%
rename from src/main/java/com/google/inject/InterceptorStackCallback.java
rename to src/com/google/inject/InterceptorStackCallback.java
diff --git a/src/main/java/com/google/inject/InternalContext.java b/src/com/google/inject/InternalContext.java
similarity index 100%
rename from src/main/java/com/google/inject/InternalContext.java
rename to src/com/google/inject/InternalContext.java
diff --git a/src/main/java/com/google/inject/InternalFactory.java b/src/com/google/inject/InternalFactory.java
similarity index 100%
rename from src/main/java/com/google/inject/InternalFactory.java
rename to src/com/google/inject/InternalFactory.java
diff --git a/src/main/java/com/google/inject/InternalFactoryToProviderAdapter.java b/src/com/google/inject/InternalFactoryToProviderAdapter.java
similarity index 100%
rename from src/main/java/com/google/inject/InternalFactoryToProviderAdapter.java
rename to src/com/google/inject/InternalFactoryToProviderAdapter.java
diff --git a/src/main/java/com/google/inject/InvalidErrorHandler.java b/src/com/google/inject/InvalidErrorHandler.java
similarity index 100%
rename from src/main/java/com/google/inject/InvalidErrorHandler.java
rename to src/com/google/inject/InvalidErrorHandler.java
diff --git a/src/main/java/com/google/inject/Key.java b/src/com/google/inject/Key.java
similarity index 100%
rename from src/main/java/com/google/inject/Key.java
rename to src/com/google/inject/Key.java
diff --git a/src/main/java/com/google/inject/LinkedBindingBuilderImpl.java b/src/com/google/inject/LinkedBindingBuilderImpl.java
similarity index 100%
rename from src/main/java/com/google/inject/LinkedBindingBuilderImpl.java
rename to src/com/google/inject/LinkedBindingBuilderImpl.java
diff --git a/src/main/java/com/google/inject/MethodAspect.java b/src/com/google/inject/MethodAspect.java
similarity index 100%
rename from src/main/java/com/google/inject/MethodAspect.java
rename to src/com/google/inject/MethodAspect.java
diff --git a/src/main/java/com/google/inject/Module.java b/src/com/google/inject/Module.java
similarity index 100%
rename from src/main/java/com/google/inject/Module.java
rename to src/com/google/inject/Module.java
diff --git a/src/main/java/com/google/inject/Provider.java b/src/com/google/inject/Provider.java
similarity index 100%
rename from src/main/java/com/google/inject/Provider.java
rename to src/com/google/inject/Provider.java
diff --git a/src/main/java/com/google/inject/ProviderToInternalFactoryAdapter.java b/src/com/google/inject/ProviderToInternalFactoryAdapter.java
similarity index 100%
rename from src/main/java/com/google/inject/ProviderToInternalFactoryAdapter.java
rename to src/com/google/inject/ProviderToInternalFactoryAdapter.java
diff --git a/src/main/java/com/google/inject/ProvisionException.java b/src/com/google/inject/ProvisionException.java
similarity index 100%
rename from src/main/java/com/google/inject/ProvisionException.java
rename to src/com/google/inject/ProvisionException.java
diff --git a/src/main/java/com/google/inject/ProxyFactory.java b/src/com/google/inject/ProxyFactory.java
similarity index 100%
rename from src/main/java/com/google/inject/ProxyFactory.java
rename to src/com/google/inject/ProxyFactory.java
diff --git a/src/main/java/com/google/inject/ProxyFactoryBuilder.java b/src/com/google/inject/ProxyFactoryBuilder.java
similarity index 100%
rename from src/main/java/com/google/inject/ProxyFactoryBuilder.java
rename to src/com/google/inject/ProxyFactoryBuilder.java
diff --git a/src/main/java/com/google/inject/Scope.java b/src/com/google/inject/Scope.java
similarity index 100%
rename from src/main/java/com/google/inject/Scope.java
rename to src/com/google/inject/Scope.java
diff --git a/src/main/java/com/google/inject/ScopeAnnotation.java b/src/com/google/inject/ScopeAnnotation.java
similarity index 100%
rename from src/main/java/com/google/inject/ScopeAnnotation.java
rename to src/com/google/inject/ScopeAnnotation.java
diff --git a/src/main/java/com/google/inject/Scopes.java b/src/com/google/inject/Scopes.java
similarity index 100%
rename from src/main/java/com/google/inject/Scopes.java
rename to src/com/google/inject/Scopes.java
diff --git a/src/main/java/com/google/inject/Stage.java b/src/com/google/inject/Stage.java
similarity index 100%
rename from src/main/java/com/google/inject/Stage.java
rename to src/com/google/inject/Stage.java
diff --git a/src/main/java/com/google/inject/TypeLiteral.java b/src/com/google/inject/TypeLiteral.java
similarity index 100%
rename from src/main/java/com/google/inject/TypeLiteral.java
rename to src/com/google/inject/TypeLiteral.java
diff --git a/src/main/java/com/google/inject/TypeWithArgument.java b/src/com/google/inject/TypeWithArgument.java
similarity index 100%
rename from src/main/java/com/google/inject/TypeWithArgument.java
rename to src/com/google/inject/TypeWithArgument.java
diff --git a/src/main/java/com/google/inject/binder/BindingAnnotationBuilder.java b/src/com/google/inject/binder/BindingAnnotationBuilder.java
similarity index 100%
rename from src/main/java/com/google/inject/binder/BindingAnnotationBuilder.java
rename to src/com/google/inject/binder/BindingAnnotationBuilder.java
diff --git a/src/main/java/com/google/inject/binder/BindingBuilder.java b/src/com/google/inject/binder/BindingBuilder.java
similarity index 100%
rename from src/main/java/com/google/inject/binder/BindingBuilder.java
rename to src/com/google/inject/binder/BindingBuilder.java
diff --git a/src/main/java/com/google/inject/binder/BindingImplementationBuilder.java b/src/com/google/inject/binder/BindingImplementationBuilder.java
similarity index 100%
rename from src/main/java/com/google/inject/binder/BindingImplementationBuilder.java
rename to src/com/google/inject/binder/BindingImplementationBuilder.java
diff --git a/src/main/java/com/google/inject/binder/BindingScopeBuilder.java b/src/com/google/inject/binder/BindingScopeBuilder.java
similarity index 100%
rename from src/main/java/com/google/inject/binder/BindingScopeBuilder.java
rename to src/com/google/inject/binder/BindingScopeBuilder.java
diff --git a/src/main/java/com/google/inject/binder/ConstantBindingBuilder.java b/src/com/google/inject/binder/ConstantBindingBuilder.java
similarity index 100%
rename from src/main/java/com/google/inject/binder/ConstantBindingBuilder.java
rename to src/com/google/inject/binder/ConstantBindingBuilder.java
diff --git a/src/main/java/com/google/inject/binder/LinkedBindingBuilder.java b/src/com/google/inject/binder/LinkedBindingBuilder.java
similarity index 100%
rename from src/main/java/com/google/inject/binder/LinkedBindingBuilder.java
rename to src/com/google/inject/binder/LinkedBindingBuilder.java
diff --git a/src/main/java/com/google/inject/binder/package-info.java b/src/com/google/inject/binder/package-info.java
similarity index 100%
rename from src/main/java/com/google/inject/binder/package-info.java
rename to src/com/google/inject/binder/package-info.java
diff --git a/src/main/java/com/google/inject/matcher/AbstractMatcher.java b/src/com/google/inject/matcher/AbstractMatcher.java
similarity index 100%
rename from src/main/java/com/google/inject/matcher/AbstractMatcher.java
rename to src/com/google/inject/matcher/AbstractMatcher.java
diff --git a/src/main/java/com/google/inject/matcher/Matcher.java b/src/com/google/inject/matcher/Matcher.java
similarity index 100%
rename from src/main/java/com/google/inject/matcher/Matcher.java
rename to src/com/google/inject/matcher/Matcher.java
diff --git a/src/main/java/com/google/inject/matcher/Matchers.java b/src/com/google/inject/matcher/Matchers.java
similarity index 100%
rename from src/main/java/com/google/inject/matcher/Matchers.java
rename to src/com/google/inject/matcher/Matchers.java
diff --git a/src/main/java/com/google/inject/matcher/package-info.java b/src/com/google/inject/matcher/package-info.java
similarity index 100%
rename from src/main/java/com/google/inject/matcher/package-info.java
rename to src/com/google/inject/matcher/package-info.java
diff --git a/src/main/java/com/google/inject/name/Named.java b/src/com/google/inject/name/Named.java
similarity index 100%
rename from src/main/java/com/google/inject/name/Named.java
rename to src/com/google/inject/name/Named.java
diff --git a/src/main/java/com/google/inject/name/NamedImpl.java b/src/com/google/inject/name/NamedImpl.java
similarity index 100%
rename from src/main/java/com/google/inject/name/NamedImpl.java
rename to src/com/google/inject/name/NamedImpl.java
diff --git a/src/main/java/com/google/inject/name/Names.java b/src/com/google/inject/name/Names.java
similarity index 100%
rename from src/main/java/com/google/inject/name/Names.java
rename to src/com/google/inject/name/Names.java
diff --git a/src/main/java/com/google/inject/name/package-info.java b/src/com/google/inject/name/package-info.java
similarity index 100%
rename from src/main/java/com/google/inject/name/package-info.java
rename to src/com/google/inject/name/package-info.java
diff --git a/src/main/java/com/google/inject/package-info.java b/src/com/google/inject/package-info.java
similarity index 100%
rename from src/main/java/com/google/inject/package-info.java
rename to src/com/google/inject/package-info.java
diff --git a/src/main/java/com/google/inject/spi/Message.java b/src/com/google/inject/spi/Message.java
similarity index 100%
rename from src/main/java/com/google/inject/spi/Message.java
rename to src/com/google/inject/spi/Message.java
diff --git a/src/main/java/com/google/inject/spi/SourceProvider.java b/src/com/google/inject/spi/SourceProvider.java
similarity index 100%
rename from src/main/java/com/google/inject/spi/SourceProvider.java
rename to src/com/google/inject/spi/SourceProvider.java
diff --git a/src/main/java/com/google/inject/spi/SourceProviders.java b/src/com/google/inject/spi/SourceProviders.java
similarity index 100%
rename from src/main/java/com/google/inject/spi/SourceProviders.java
rename to src/com/google/inject/spi/SourceProviders.java
diff --git a/src/main/java/com/google/inject/spi/package-info.java b/src/com/google/inject/spi/package-info.java
similarity index 100%
rename from src/main/java/com/google/inject/spi/package-info.java
rename to src/com/google/inject/spi/package-info.java
diff --git a/src/main/java/com/google/inject/tools/jmx/ManagedBinding.java b/src/com/google/inject/tools/jmx/ManagedBinding.java
similarity index 100%
rename from src/main/java/com/google/inject/tools/jmx/ManagedBinding.java
rename to src/com/google/inject/tools/jmx/ManagedBinding.java
diff --git a/src/main/java/com/google/inject/tools/jmx/ManagedBindingMBean.java b/src/com/google/inject/tools/jmx/ManagedBindingMBean.java
similarity index 100%
rename from src/main/java/com/google/inject/tools/jmx/ManagedBindingMBean.java
rename to src/com/google/inject/tools/jmx/ManagedBindingMBean.java
diff --git a/src/main/java/com/google/inject/tools/jmx/Manager.java b/src/com/google/inject/tools/jmx/Manager.java
similarity index 100%
rename from src/main/java/com/google/inject/tools/jmx/Manager.java
rename to src/com/google/inject/tools/jmx/Manager.java
diff --git a/src/main/java/com/google/inject/util/AbstractReferenceCache.java b/src/com/google/inject/util/AbstractReferenceCache.java
similarity index 100%
rename from src/main/java/com/google/inject/util/AbstractReferenceCache.java
rename to src/com/google/inject/util/AbstractReferenceCache.java
diff --git a/src/main/java/com/google/inject/util/Annotations.java b/src/com/google/inject/util/Annotations.java
similarity index 100%
rename from src/main/java/com/google/inject/util/Annotations.java
rename to src/com/google/inject/util/Annotations.java
diff --git a/src/main/java/com/google/inject/util/DuplicateAnnotationException.java b/src/com/google/inject/util/DuplicateAnnotationException.java
similarity index 100%
rename from src/main/java/com/google/inject/util/DuplicateAnnotationException.java
rename to src/com/google/inject/util/DuplicateAnnotationException.java
diff --git a/src/main/java/com/google/inject/util/FinalizablePhantomReference.java b/src/com/google/inject/util/FinalizablePhantomReference.java
similarity index 100%
rename from src/main/java/com/google/inject/util/FinalizablePhantomReference.java
rename to src/com/google/inject/util/FinalizablePhantomReference.java
diff --git a/src/main/java/com/google/inject/util/FinalizableReference.java b/src/com/google/inject/util/FinalizableReference.java
similarity index 100%
rename from src/main/java/com/google/inject/util/FinalizableReference.java
rename to src/com/google/inject/util/FinalizableReference.java
diff --git a/src/main/java/com/google/inject/util/FinalizableReferenceQueue.java b/src/com/google/inject/util/FinalizableReferenceQueue.java
similarity index 100%
rename from src/main/java/com/google/inject/util/FinalizableReferenceQueue.java
rename to src/com/google/inject/util/FinalizableReferenceQueue.java
diff --git a/src/main/java/com/google/inject/util/FinalizableSoftReference.java b/src/com/google/inject/util/FinalizableSoftReference.java
similarity index 100%
rename from src/main/java/com/google/inject/util/FinalizableSoftReference.java
rename to src/com/google/inject/util/FinalizableSoftReference.java
diff --git a/src/main/java/com/google/inject/util/FinalizableWeakReference.java b/src/com/google/inject/util/FinalizableWeakReference.java
similarity index 100%
rename from src/main/java/com/google/inject/util/FinalizableWeakReference.java
rename to src/com/google/inject/util/FinalizableWeakReference.java
diff --git a/src/main/java/com/google/inject/util/Function.java b/src/com/google/inject/util/Function.java
similarity index 100%
rename from src/main/java/com/google/inject/util/Function.java
rename to src/com/google/inject/util/Function.java
diff --git a/src/main/java/com/google/inject/util/GuiceFastClass.java b/src/com/google/inject/util/GuiceFastClass.java
similarity index 100%
rename from src/main/java/com/google/inject/util/GuiceFastClass.java
rename to src/com/google/inject/util/GuiceFastClass.java
diff --git a/src/main/java/com/google/inject/util/GuiceNamingPolicy.java b/src/com/google/inject/util/GuiceNamingPolicy.java
similarity index 100%
rename from src/main/java/com/google/inject/util/GuiceNamingPolicy.java
rename to src/com/google/inject/util/GuiceNamingPolicy.java
diff --git a/src/main/java/com/google/inject/util/LineNumbers.java b/src/com/google/inject/util/LineNumbers.java
similarity index 100%
rename from src/main/java/com/google/inject/util/LineNumbers.java
rename to src/com/google/inject/util/LineNumbers.java
diff --git a/src/main/java/com/google/inject/util/Objects.java b/src/com/google/inject/util/Objects.java
similarity index 100%
rename from src/main/java/com/google/inject/util/Objects.java
rename to src/com/google/inject/util/Objects.java
diff --git a/src/main/java/com/google/inject/util/ReferenceCache.java b/src/com/google/inject/util/ReferenceCache.java
similarity index 100%
rename from src/main/java/com/google/inject/util/ReferenceCache.java
rename to src/com/google/inject/util/ReferenceCache.java
diff --git a/src/main/java/com/google/inject/util/ReferenceMap.java b/src/com/google/inject/util/ReferenceMap.java
similarity index 100%
rename from src/main/java/com/google/inject/util/ReferenceMap.java
rename to src/com/google/inject/util/ReferenceMap.java
diff --git a/src/main/java/com/google/inject/util/ReferenceType.java b/src/com/google/inject/util/ReferenceType.java
similarity index 100%
rename from src/main/java/com/google/inject/util/ReferenceType.java
rename to src/com/google/inject/util/ReferenceType.java
diff --git a/src/main/java/com/google/inject/util/StackTraceElements.java b/src/com/google/inject/util/StackTraceElements.java
similarity index 100%
rename from src/main/java/com/google/inject/util/StackTraceElements.java
rename to src/com/google/inject/util/StackTraceElements.java
diff --git a/src/main/java/com/google/inject/util/Stopwatch.java b/src/com/google/inject/util/Stopwatch.java
similarity index 100%
rename from src/main/java/com/google/inject/util/Stopwatch.java
rename to src/com/google/inject/util/Stopwatch.java
diff --git a/src/main/java/com/google/inject/util/Strings.java b/src/com/google/inject/util/Strings.java
similarity index 100%
rename from src/main/java/com/google/inject/util/Strings.java
rename to src/com/google/inject/util/Strings.java
diff --git a/src/main/java/com/google/inject/util/SurrogateAnnotations.java b/src/com/google/inject/util/SurrogateAnnotations.java
similarity index 100%
rename from src/main/java/com/google/inject/util/SurrogateAnnotations.java
rename to src/com/google/inject/util/SurrogateAnnotations.java
diff --git a/src/main/java/com/google/inject/util/ToStringBuilder.java b/src/com/google/inject/util/ToStringBuilder.java
similarity index 100%
rename from src/main/java/com/google/inject/util/ToStringBuilder.java
rename to src/com/google/inject/util/ToStringBuilder.java
diff --git a/src/main/java/com/google/inject/util/package-info.java b/src/com/google/inject/util/package-info.java
similarity index 100%
rename from src/main/java/com/google/inject/util/package-info.java
rename to src/com/google/inject/util/package-info.java
diff --git a/struts2/example/build.properties b/struts2/example/build.properties
index f750b50..a155282 100644
--- a/struts2/example/build.properties
+++ b/struts2/example/build.properties
@@ -1,4 +1,3 @@
 lib.dir=../lib
-src.dir=src/main/java
-test.dir=src/test/java
+src.dir=src
 build.dir=build
diff --git a/struts2/example/src/main/java/com/google/inject/struts2/example/Count.java b/struts2/example/src/com/google/inject/struts2/example/Count.java
similarity index 100%
rename from struts2/example/src/main/java/com/google/inject/struts2/example/Count.java
rename to struts2/example/src/com/google/inject/struts2/example/Count.java
diff --git a/struts2/example/src/main/java/com/google/inject/struts2/example/Counter.java b/struts2/example/src/com/google/inject/struts2/example/Counter.java
similarity index 100%
rename from struts2/example/src/main/java/com/google/inject/struts2/example/Counter.java
rename to struts2/example/src/com/google/inject/struts2/example/Counter.java
diff --git a/struts2/example/src/main/java/com/google/inject/struts2/example/ExampleModule.java b/struts2/example/src/com/google/inject/struts2/example/ExampleModule.java
similarity index 100%
rename from struts2/example/src/main/java/com/google/inject/struts2/example/ExampleModule.java
rename to struts2/example/src/com/google/inject/struts2/example/ExampleModule.java
diff --git a/struts2/example/src/main/java/com/google/inject/struts2/example/Main.java b/struts2/example/src/com/google/inject/struts2/example/Main.java
similarity index 100%
rename from struts2/example/src/main/java/com/google/inject/struts2/example/Main.java
rename to struts2/example/src/com/google/inject/struts2/example/Main.java
diff --git a/struts2/plugin/build.properties b/struts2/plugin/build.properties
index 794228a..31ee68d 100644
--- a/struts2/plugin/build.properties
+++ b/struts2/plugin/build.properties
@@ -1,4 +1,4 @@
 version=1.0rc2
 lib.dir=../lib
-src.dir=src/main/java
+src.dir=src
 build.dir=build
diff --git a/struts2/plugin/src/main/java/com/google/inject/struts2/GuiceObjectFactory.java b/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java
similarity index 100%
rename from struts2/plugin/src/main/java/com/google/inject/struts2/GuiceObjectFactory.java
rename to struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java
diff --git a/struts2/plugin/src/main/java/struts-plugin.xml b/struts2/plugin/src/struts-plugin.xml
similarity index 100%
rename from struts2/plugin/src/main/java/struts-plugin.xml
rename to struts2/plugin/src/struts-plugin.xml
diff --git a/src/test/java/com/google/inject/AllTests.java b/test/com/google/inject/AllTests.java
similarity index 100%
rename from src/test/java/com/google/inject/AllTests.java
rename to test/com/google/inject/AllTests.java
diff --git a/src/test/java/com/google/inject/BindingAnnotationTest.java b/test/com/google/inject/BindingAnnotationTest.java
similarity index 100%
rename from src/test/java/com/google/inject/BindingAnnotationTest.java
rename to test/com/google/inject/BindingAnnotationTest.java
diff --git a/src/test/java/com/google/inject/BindingBuilderTest.java b/test/com/google/inject/BindingBuilderTest.java
similarity index 100%
rename from src/test/java/com/google/inject/BindingBuilderTest.java
rename to test/com/google/inject/BindingBuilderTest.java
diff --git a/src/test/java/com/google/inject/BoundInstanceInjectionTest.java b/test/com/google/inject/BoundInstanceInjectionTest.java
similarity index 100%
rename from src/test/java/com/google/inject/BoundInstanceInjectionTest.java
rename to test/com/google/inject/BoundInstanceInjectionTest.java
diff --git a/src/test/java/com/google/inject/BoundProviderTest.java b/test/com/google/inject/BoundProviderTest.java
similarity index 100%
rename from src/test/java/com/google/inject/BoundProviderTest.java
rename to test/com/google/inject/BoundProviderTest.java
diff --git a/src/test/java/com/google/inject/CircularDependencyTest.java b/test/com/google/inject/CircularDependencyTest.java
similarity index 100%
rename from src/test/java/com/google/inject/CircularDependencyTest.java
rename to test/com/google/inject/CircularDependencyTest.java
diff --git a/src/test/java/com/google/inject/ConstantConversionTest.java b/test/com/google/inject/ConstantConversionTest.java
similarity index 100%
rename from src/test/java/com/google/inject/ConstantConversionTest.java
rename to test/com/google/inject/ConstantConversionTest.java
diff --git a/src/test/java/com/google/inject/ContainerTest.java b/test/com/google/inject/ContainerTest.java
similarity index 100%
rename from src/test/java/com/google/inject/ContainerTest.java
rename to test/com/google/inject/ContainerTest.java
diff --git a/src/test/java/com/google/inject/ErrorHandlingTest.java b/test/com/google/inject/ErrorHandlingTest.java
similarity index 100%
rename from src/test/java/com/google/inject/ErrorHandlingTest.java
rename to test/com/google/inject/ErrorHandlingTest.java
diff --git a/src/test/java/com/google/inject/GenericInjectionTest.java b/test/com/google/inject/GenericInjectionTest.java
similarity index 100%
rename from src/test/java/com/google/inject/GenericInjectionTest.java
rename to test/com/google/inject/GenericInjectionTest.java
diff --git a/src/test/java/com/google/inject/ImplicitBindingTest.java b/test/com/google/inject/ImplicitBindingTest.java
similarity index 100%
rename from src/test/java/com/google/inject/ImplicitBindingTest.java
rename to test/com/google/inject/ImplicitBindingTest.java
diff --git a/src/test/java/com/google/inject/IntegrationTest.java b/test/com/google/inject/IntegrationTest.java
similarity index 100%
rename from src/test/java/com/google/inject/IntegrationTest.java
rename to test/com/google/inject/IntegrationTest.java
diff --git a/src/test/java/com/google/inject/KeyTest.java b/test/com/google/inject/KeyTest.java
similarity index 100%
rename from src/test/java/com/google/inject/KeyTest.java
rename to test/com/google/inject/KeyTest.java
diff --git a/src/test/java/com/google/inject/NotRequiredTest.java b/test/com/google/inject/NotRequiredTest.java
similarity index 100%
rename from src/test/java/com/google/inject/NotRequiredTest.java
rename to test/com/google/inject/NotRequiredTest.java
diff --git a/src/test/java/com/google/inject/PerformanceComparison.java b/test/com/google/inject/PerformanceComparison.java
similarity index 100%
rename from src/test/java/com/google/inject/PerformanceComparison.java
rename to test/com/google/inject/PerformanceComparison.java
diff --git a/src/test/java/com/google/inject/PreloadingTest.java b/test/com/google/inject/PreloadingTest.java
similarity index 100%
rename from src/test/java/com/google/inject/PreloadingTest.java
rename to test/com/google/inject/PreloadingTest.java
diff --git a/src/test/java/com/google/inject/ProviderInjectionTest.java b/test/com/google/inject/ProviderInjectionTest.java
similarity index 100%
rename from src/test/java/com/google/inject/ProviderInjectionTest.java
rename to test/com/google/inject/ProviderInjectionTest.java
diff --git a/src/test/java/com/google/inject/ProxyFactoryTest.java b/test/com/google/inject/ProxyFactoryTest.java
similarity index 100%
rename from src/test/java/com/google/inject/ProxyFactoryTest.java
rename to test/com/google/inject/ProxyFactoryTest.java
diff --git a/src/test/java/com/google/inject/ReflectionTest.java b/test/com/google/inject/ReflectionTest.java
similarity index 100%
rename from src/test/java/com/google/inject/ReflectionTest.java
rename to test/com/google/inject/ReflectionTest.java
diff --git a/src/test/java/com/google/inject/ScopesTest.java b/test/com/google/inject/ScopesTest.java
similarity index 100%
rename from src/test/java/com/google/inject/ScopesTest.java
rename to test/com/google/inject/ScopesTest.java
diff --git a/src/test/java/com/google/inject/StaticInjectionTest.java b/test/com/google/inject/StaticInjectionTest.java
similarity index 100%
rename from src/test/java/com/google/inject/StaticInjectionTest.java
rename to test/com/google/inject/StaticInjectionTest.java
diff --git a/src/test/java/com/google/inject/SuperclassTest.java b/test/com/google/inject/SuperclassTest.java
similarity index 100%
rename from src/test/java/com/google/inject/SuperclassTest.java
rename to test/com/google/inject/SuperclassTest.java
diff --git a/src/test/java/com/google/inject/TypeLiteralTest.java b/test/com/google/inject/TypeLiteralTest.java
similarity index 100%
rename from src/test/java/com/google/inject/TypeLiteralTest.java
rename to test/com/google/inject/TypeLiteralTest.java
diff --git a/src/test/java/com/google/inject/matcher/MatcherTest.java b/test/com/google/inject/matcher/MatcherTest.java
similarity index 100%
rename from src/test/java/com/google/inject/matcher/MatcherTest.java
rename to test/com/google/inject/matcher/MatcherTest.java
diff --git a/src/test/java/com/google/inject/tools/jmx/JmxTest.java b/test/com/google/inject/tools/jmx/JmxTest.java
similarity index 100%
rename from src/test/java/com/google/inject/tools/jmx/JmxTest.java
rename to test/com/google/inject/tools/jmx/JmxTest.java
diff --git a/src/test/java/com/google/inject/util/FinalizableReferenceQueueTest.java b/test/com/google/inject/util/FinalizableReferenceQueueTest.java
similarity index 100%
rename from src/test/java/com/google/inject/util/FinalizableReferenceQueueTest.java
rename to test/com/google/inject/util/FinalizableReferenceQueueTest.java
diff --git a/src/test/java/com/google/inject/util/ReferenceCacheTest.java b/test/com/google/inject/util/ReferenceCacheTest.java
similarity index 100%
rename from src/test/java/com/google/inject/util/ReferenceCacheTest.java
rename to test/com/google/inject/util/ReferenceCacheTest.java
diff --git a/src/test/java/com/google/inject/util/ReferenceMapTest.java b/test/com/google/inject/util/ReferenceMapTest.java
similarity index 100%
rename from src/test/java/com/google/inject/util/ReferenceMapTest.java
rename to test/com/google/inject/util/ReferenceMapTest.java
diff --git a/src/test/java/com/google/inject/util/ReferenceMapTestSuite.java b/test/com/google/inject/util/ReferenceMapTestSuite.java
similarity index 100%
rename from src/test/java/com/google/inject/util/ReferenceMapTestSuite.java
rename to test/com/google/inject/util/ReferenceMapTestSuite.java
diff --git a/src/test/java/com/google/inject/util/SurrogateAnnotationsTest.java b/test/com/google/inject/util/SurrogateAnnotationsTest.java
similarity index 100%
rename from src/test/java/com/google/inject/util/SurrogateAnnotationsTest.java
rename to test/com/google/inject/util/SurrogateAnnotationsTest.java