Issue 552: (step 1) move core code to its own subdirectory

git-svn-id: https://google-guice.googlecode.com/svn/trunk@1300 d779f126-a31b-0410-b53b-1d3aecad763e
tklee1975 · Oct 21, 2010 · 74d714c · 74d714c
1 parent 97adab5
commit 74d714c
Show file tree

Hide file tree

Showing 298 changed files with 9 additions and 9 deletions.
diff --git a/build.properties b/build.properties
@@ -1,6 +1,6 @@
 lib.dir=lib
-src.dir=src
-test.dir=test
+src.dir=core/src
+test.dir=core/test
 servlet.src.dir=extensions/servlet/src
 spring.src.dir=extensions/spring/src
 assistedinject.src.dir=extensions/assistedinject/src

diff --git a/build.xml b/build.xml
@@ -107,7 +107,7 @@
              docletpath="lib/build/doclava.jar"
              bootclasspath="${javahome}/jre/lib/rt.jar"
              maxmemory="512M">
-      <fileset dir="src" defaultexcludes="yes">
+      <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="com/google/**"/>
         <exclude name="com/google/inject/internal/**"/>
       </fileset>

diff --git a/common.xml b/common.xml
@@ -105,7 +105,7 @@
       description="Create a .jar file with sources">
     <mkdir dir="${build.dir}"/>
     <zip destfile="${build.dir}/${ant.project.name}-${version}-src.jar">
-      <fileset dir="src"/>
+      <fileset dir="${src.dir}"/>
     </zip>
   </target>
 

diff --git a/copy.sh b/copy.sh
@@ -3,8 +3,8 @@
 
 client=/usr/local/google/clients/collect/google3
 
-srcdir=src/com/google/inject/internal
-testdir=test/com/google/inject/internal
+srcdir=core/src/com/google/inject/internal
+testdir=core/test/com/google/inject/internal
 
 filter() {
   sed 's/com.google.common.base.internal/com.google.inject.internal/' | \
@@ -51,4 +51,4 @@ copy $commonpath/collect/ForwardingSet.java $testdir
 copy $commonpath/collect/ForwardingMap.java $testdir
 copy $commonpath/base/Preconditions.java $testdir
 
-chmod +w -R src test
+chmod +w -R $srcdir $testdir
diff --git a/src/com/google/inject/AbstractModule.java → ...src/com/google/inject/AbstractModule.java b/src/com/google/inject/AbstractModule.java → ...src/com/google/inject/AbstractModule.java
diff --git a/src/com/google/inject/Binder.java → core/src/com/google/inject/Binder.java b/src/com/google/inject/Binder.java → core/src/com/google/inject/Binder.java
diff --git a/src/com/google/inject/Binding.java → core/src/com/google/inject/Binding.java b/src/com/google/inject/Binding.java → core/src/com/google/inject/Binding.java
diff --git a/src/com/google/inject/BindingAnnotation.java → .../com/google/inject/BindingAnnotation.java b/src/com/google/inject/BindingAnnotation.java → .../com/google/inject/BindingAnnotation.java
diff --git a/...google/inject/ConfigurationException.java → ...google/inject/ConfigurationException.java b/...google/inject/ConfigurationException.java → ...google/inject/ConfigurationException.java
diff --git a/src/com/google/inject/CreationException.java → .../com/google/inject/CreationException.java b/src/com/google/inject/CreationException.java → .../com/google/inject/CreationException.java
diff --git a/src/com/google/inject/Exposed.java → core/src/com/google/inject/Exposed.java b/src/com/google/inject/Exposed.java → core/src/com/google/inject/Exposed.java
diff --git a/src/com/google/inject/Guice.java → core/src/com/google/inject/Guice.java b/src/com/google/inject/Guice.java → core/src/com/google/inject/Guice.java
diff --git a/src/com/google/inject/ImplementedBy.java → .../src/com/google/inject/ImplementedBy.java b/src/com/google/inject/ImplementedBy.java → .../src/com/google/inject/ImplementedBy.java
diff --git a/src/com/google/inject/Inject.java → core/src/com/google/inject/Inject.java b/src/com/google/inject/Inject.java → core/src/com/google/inject/Inject.java
diff --git a/src/com/google/inject/Injector.java → core/src/com/google/inject/Injector.java b/src/com/google/inject/Injector.java → core/src/com/google/inject/Injector.java
diff --git a/src/com/google/inject/InjectorBuilder.java → ...rc/com/google/inject/InjectorBuilder.java b/src/com/google/inject/InjectorBuilder.java → ...rc/com/google/inject/InjectorBuilder.java
diff --git a/src/com/google/inject/Key.java → core/src/com/google/inject/Key.java b/src/com/google/inject/Key.java → core/src/com/google/inject/Key.java
diff --git a/src/com/google/inject/MembersInjector.java → ...rc/com/google/inject/MembersInjector.java b/src/com/google/inject/MembersInjector.java → ...rc/com/google/inject/MembersInjector.java
diff --git a/src/com/google/inject/Module.java → core/src/com/google/inject/Module.java b/src/com/google/inject/Module.java → core/src/com/google/inject/Module.java
diff --git a/...om/google/inject/OutOfScopeException.java → ...om/google/inject/OutOfScopeException.java b/...om/google/inject/OutOfScopeException.java → ...om/google/inject/OutOfScopeException.java
diff --git a/src/com/google/inject/PrivateBinder.java → .../src/com/google/inject/PrivateBinder.java b/src/com/google/inject/PrivateBinder.java → .../src/com/google/inject/PrivateBinder.java
diff --git a/src/com/google/inject/PrivateModule.java → .../src/com/google/inject/PrivateModule.java b/src/com/google/inject/PrivateModule.java → .../src/com/google/inject/PrivateModule.java
diff --git a/src/com/google/inject/ProvidedBy.java → core/src/com/google/inject/ProvidedBy.java b/src/com/google/inject/ProvidedBy.java → core/src/com/google/inject/ProvidedBy.java
diff --git a/src/com/google/inject/Provider.java → core/src/com/google/inject/Provider.java b/src/com/google/inject/Provider.java → core/src/com/google/inject/Provider.java
diff --git a/src/com/google/inject/Provides.java → core/src/com/google/inject/Provides.java b/src/com/google/inject/Provides.java → core/src/com/google/inject/Provides.java
diff --git a/...com/google/inject/ProvisionException.java → ...com/google/inject/ProvisionException.java b/...com/google/inject/ProvisionException.java → ...com/google/inject/ProvisionException.java
diff --git a/src/com/google/inject/Scope.java → core/src/com/google/inject/Scope.java b/src/com/google/inject/Scope.java → core/src/com/google/inject/Scope.java
diff --git a/src/com/google/inject/ScopeAnnotation.java → ...rc/com/google/inject/ScopeAnnotation.java b/src/com/google/inject/ScopeAnnotation.java → ...rc/com/google/inject/ScopeAnnotation.java
diff --git a/src/com/google/inject/Scopes.java → core/src/com/google/inject/Scopes.java b/src/com/google/inject/Scopes.java → core/src/com/google/inject/Scopes.java
diff --git a/src/com/google/inject/Singleton.java → core/src/com/google/inject/Singleton.java b/src/com/google/inject/Singleton.java → core/src/com/google/inject/Singleton.java
diff --git a/src/com/google/inject/Stage.java → core/src/com/google/inject/Stage.java b/src/com/google/inject/Stage.java → core/src/com/google/inject/Stage.java
diff --git a/src/com/google/inject/TypeLiteral.java → core/src/com/google/inject/TypeLiteral.java b/src/com/google/inject/TypeLiteral.java → core/src/com/google/inject/TypeLiteral.java
diff --git a/...nject/binder/AnnotatedBindingBuilder.java → ...nject/binder/AnnotatedBindingBuilder.java b/...nject/binder/AnnotatedBindingBuilder.java → ...nject/binder/AnnotatedBindingBuilder.java
diff --git a/...nder/AnnotatedConstantBindingBuilder.java → ...nder/AnnotatedConstantBindingBuilder.java b/...nder/AnnotatedConstantBindingBuilder.java → ...nder/AnnotatedConstantBindingBuilder.java
diff --git a/...nject/binder/AnnotatedElementBuilder.java → ...nject/binder/AnnotatedElementBuilder.java b/...nject/binder/AnnotatedElementBuilder.java → ...nject/binder/AnnotatedElementBuilder.java
diff --git a/...inject/binder/ConstantBindingBuilder.java → ...inject/binder/ConstantBindingBuilder.java b/...inject/binder/ConstantBindingBuilder.java → ...inject/binder/ConstantBindingBuilder.java
diff --git a/...e/inject/binder/LinkedBindingBuilder.java → ...e/inject/binder/LinkedBindingBuilder.java b/...e/inject/binder/LinkedBindingBuilder.java → ...e/inject/binder/LinkedBindingBuilder.java
diff --git a/...e/inject/binder/ScopedBindingBuilder.java → ...e/inject/binder/ScopedBindingBuilder.java b/...e/inject/binder/ScopedBindingBuilder.java → ...e/inject/binder/ScopedBindingBuilder.java
diff --git a/...om/google/inject/binder/package-info.java → ...om/google/inject/binder/package-info.java b/...om/google/inject/binder/package-info.java → ...om/google/inject/binder/package-info.java
diff --git a/...ject/internal/AbstractBindingBuilder.java → ...ject/internal/AbstractBindingBuilder.java b/...ject/internal/AbstractBindingBuilder.java → ...ject/internal/AbstractBindingBuilder.java
diff --git a/...le/inject/internal/AbstractProcessor.java → ...le/inject/internal/AbstractProcessor.java b/...le/inject/internal/AbstractProcessor.java → ...le/inject/internal/AbstractProcessor.java
diff --git a/...m/google/inject/internal/Annotations.java → ...m/google/inject/internal/Annotations.java b/...m/google/inject/internal/Annotations.java → ...m/google/inject/internal/Annotations.java
diff --git a/...oogle/inject/internal/BindingBuilder.java → ...oogle/inject/internal/BindingBuilder.java b/...oogle/inject/internal/BindingBuilder.java → ...oogle/inject/internal/BindingBuilder.java
diff --git a/...m/google/inject/internal/BindingImpl.java → ...m/google/inject/internal/BindingImpl.java b/...m/google/inject/internal/BindingImpl.java → ...m/google/inject/internal/BindingImpl.java
diff --git a/...gle/inject/internal/BindingProcessor.java → ...gle/inject/internal/BindingProcessor.java b/...gle/inject/internal/BindingProcessor.java → ...gle/inject/internal/BindingProcessor.java
diff --git a/...inject/internal/BoundProviderFactory.java → ...inject/internal/BoundProviderFactory.java b/...inject/internal/BoundProviderFactory.java → ...inject/internal/BoundProviderFactory.java
diff --git a/...m/google/inject/internal/BytecodeGen.java → ...m/google/inject/internal/BytecodeGen.java b/...m/google/inject/internal/BytecodeGen.java → ...m/google/inject/internal/BytecodeGen.java
diff --git a/...ect/internal/CircularDependencyProxy.java → ...ect/internal/CircularDependencyProxy.java b/...ect/internal/CircularDependencyProxy.java → ...ect/internal/CircularDependencyProxy.java
diff --git a/.../internal/ConstantBindingBuilderImpl.java → .../internal/ConstantBindingBuilderImpl.java b/.../internal/ConstantBindingBuilderImpl.java → .../internal/ConstantBindingBuilderImpl.java
diff --git a/...ogle/inject/internal/ConstantFactory.java → ...ogle/inject/internal/ConstantFactory.java b/...ogle/inject/internal/ConstantFactory.java → ...ogle/inject/internal/ConstantFactory.java
diff --git a/.../inject/internal/ConstructionContext.java → .../inject/internal/ConstructionContext.java b/.../inject/internal/ConstructionContext.java → .../inject/internal/ConstructionContext.java
diff --git a/...le/inject/internal/ConstructionProxy.java → ...le/inject/internal/ConstructionProxy.java b/...le/inject/internal/ConstructionProxy.java → ...le/inject/internal/ConstructionProxy.java
diff --git a/...ct/internal/ConstructionProxyFactory.java → ...ct/internal/ConstructionProxyFactory.java b/...ct/internal/ConstructionProxyFactory.java → ...ct/internal/ConstructionProxyFactory.java
diff --git a/...ject/internal/ConstructorBindingImpl.java → ...ject/internal/ConstructorBindingImpl.java b/...ject/internal/ConstructorBindingImpl.java → ...ject/internal/ConstructorBindingImpl.java
diff --git a/.../inject/internal/ConstructorInjector.java → .../inject/internal/ConstructorInjector.java b/.../inject/internal/ConstructorInjector.java → .../inject/internal/ConstructorInjector.java
diff --git a/...ct/internal/ConstructorInjectorStore.java → ...ct/internal/ConstructorInjectorStore.java b/...ct/internal/ConstructorInjectorStore.java → ...ct/internal/ConstructorInjectorStore.java
diff --git a/...e/inject/internal/ContextualCallable.java → ...e/inject/internal/ContextualCallable.java b/...e/inject/internal/ContextualCallable.java → ...e/inject/internal/ContextualCallable.java
diff --git a/...rnal/DefaultConstructionProxyFactory.java → ...rnal/DefaultConstructionProxyFactory.java b/...rnal/DefaultConstructionProxyFactory.java → ...rnal/DefaultConstructionProxyFactory.java
diff --git a/...ogle/inject/internal/DeferredLookups.java → ...ogle/inject/internal/DeferredLookups.java b/...ogle/inject/internal/DeferredLookups.java → ...ogle/inject/internal/DeferredLookups.java
diff --git a/...internal/DelegatingInvocationHandler.java → ...internal/DelegatingInvocationHandler.java b/...internal/DelegatingInvocationHandler.java → ...internal/DelegatingInvocationHandler.java
diff --git a/...google/inject/internal/EncounterImpl.java → ...google/inject/internal/EncounterImpl.java b/...google/inject/internal/EncounterImpl.java → ...google/inject/internal/EncounterImpl.java
diff --git a/.../google/inject/internal/ErrorHandler.java → .../google/inject/internal/ErrorHandler.java b/.../google/inject/internal/ErrorHandler.java → .../google/inject/internal/ErrorHandler.java
diff --git a/src/com/google/inject/internal/Errors.java → ...rc/com/google/inject/internal/Errors.java b/src/com/google/inject/internal/Errors.java → ...rc/com/google/inject/internal/Errors.java
diff --git a/...ogle/inject/internal/ErrorsException.java → ...ogle/inject/internal/ErrorsException.java b/...ogle/inject/internal/ErrorsException.java → ...ogle/inject/internal/ErrorsException.java
diff --git a/...om/google/inject/internal/Exceptions.java → ...om/google/inject/internal/Exceptions.java b/...om/google/inject/internal/Exceptions.java → ...om/google/inject/internal/Exceptions.java
diff --git a/...e/inject/internal/ExposedBindingImpl.java → ...e/inject/internal/ExposedBindingImpl.java b/...e/inject/internal/ExposedBindingImpl.java → ...e/inject/internal/ExposedBindingImpl.java
diff --git a/...le/inject/internal/ExposedKeyFactory.java → ...le/inject/internal/ExposedKeyFactory.java b/...le/inject/internal/ExposedKeyFactory.java → ...le/inject/internal/ExposedKeyFactory.java
diff --git a/...ogle/inject/internal/ExposureBuilder.java → ...ogle/inject/internal/ExposureBuilder.java b/...ogle/inject/internal/ExposureBuilder.java → ...ogle/inject/internal/ExposureBuilder.java
diff --git a/.../google/inject/internal/FactoryProxy.java → .../google/inject/internal/FactoryProxy.java b/.../google/inject/internal/FactoryProxy.java → .../google/inject/internal/FactoryProxy.java
diff --git a/...google/inject/internal/FailableCache.java → ...google/inject/internal/FailableCache.java b/...google/inject/internal/FailableCache.java → ...google/inject/internal/FailableCache.java
diff --git a/...ogle/inject/internal/InheritingState.java → ...ogle/inject/internal/InheritingState.java b/...ogle/inject/internal/InheritingState.java → ...ogle/inject/internal/InheritingState.java
diff --git a/...google/inject/internal/Initializable.java → ...google/inject/internal/Initializable.java b/...google/inject/internal/Initializable.java → ...google/inject/internal/Initializable.java
diff --git a/...oogle/inject/internal/Initializables.java → ...oogle/inject/internal/Initializables.java b/...oogle/inject/internal/Initializables.java → ...oogle/inject/internal/Initializables.java
diff --git a/...m/google/inject/internal/Initializer.java → ...m/google/inject/internal/Initializer.java b/...m/google/inject/internal/Initializer.java → ...m/google/inject/internal/Initializer.java
diff --git a/...t/internal/InjectionRequestProcessor.java → ...t/internal/InjectionRequestProcessor.java b/...t/internal/InjectionRequestProcessor.java → ...t/internal/InjectionRequestProcessor.java
diff --git a/.../google/inject/internal/InjectorImpl.java → .../google/inject/internal/InjectorImpl.java b/.../google/inject/internal/InjectorImpl.java → .../google/inject/internal/InjectorImpl.java
diff --git a/...google/inject/internal/InjectorShell.java → ...google/inject/internal/InjectorShell.java b/...google/inject/internal/InjectorShell.java → ...google/inject/internal/InjectorShell.java
diff --git a/.../inject/internal/InstanceBindingImpl.java → .../inject/internal/InstanceBindingImpl.java b/.../inject/internal/InstanceBindingImpl.java → .../inject/internal/InstanceBindingImpl.java
diff --git a/...internal/InterceptorBindingProcessor.java → ...internal/InterceptorBindingProcessor.java b/...internal/InterceptorBindingProcessor.java → ...internal/InterceptorBindingProcessor.java
diff --git a/...ct/internal/InterceptorStackCallback.java → ...ct/internal/InterceptorStackCallback.java b/...ct/internal/InterceptorStackCallback.java → ...ct/internal/InterceptorStackCallback.java
diff --git a/...ogle/inject/internal/InternalContext.java → ...ogle/inject/internal/InternalContext.java b/...ogle/inject/internal/InternalContext.java → ...ogle/inject/internal/InternalContext.java
diff --git a/...ogle/inject/internal/InternalFactory.java → ...ogle/inject/internal/InternalFactory.java b/...ogle/inject/internal/InternalFactory.java → ...ogle/inject/internal/InternalFactory.java
diff --git a/...nal/InternalFactoryToProviderAdapter.java → ...nal/InternalFactoryToProviderAdapter.java b/...nal/InternalFactoryToProviderAdapter.java → ...nal/InternalFactoryToProviderAdapter.java
diff --git a/...ect/internal/InternalInjectorCreator.java → ...ect/internal/InternalInjectorCreator.java b/...ect/internal/InternalInjectorCreator.java → ...ect/internal/InternalInjectorCreator.java
diff --git a/...le/inject/internal/LinkedBindingImpl.java → ...le/inject/internal/LinkedBindingImpl.java b/...le/inject/internal/LinkedBindingImpl.java → ...le/inject/internal/LinkedBindingImpl.java
diff --git a/...t/internal/LinkedProviderBindingImpl.java → ...t/internal/LinkedProviderBindingImpl.java b/...t/internal/LinkedProviderBindingImpl.java → ...t/internal/LinkedProviderBindingImpl.java
diff --git a/...ogle/inject/internal/LookupProcessor.java → ...ogle/inject/internal/LookupProcessor.java b/...ogle/inject/internal/LookupProcessor.java → ...ogle/inject/internal/LookupProcessor.java
diff --git a/src/com/google/inject/internal/Lookups.java → ...c/com/google/inject/internal/Lookups.java b/src/com/google/inject/internal/Lookups.java → ...c/com/google/inject/internal/Lookups.java
diff --git a/.../inject/internal/MatcherAndConverter.java → .../inject/internal/MatcherAndConverter.java b/.../inject/internal/MatcherAndConverter.java → .../inject/internal/MatcherAndConverter.java
diff --git a/.../inject/internal/MembersInjectorImpl.java → .../inject/internal/MembersInjectorImpl.java b/.../inject/internal/MembersInjectorImpl.java → .../inject/internal/MembersInjectorImpl.java
diff --git a/...inject/internal/MembersInjectorStore.java → ...inject/internal/MembersInjectorStore.java b/...inject/internal/MembersInjectorStore.java → ...inject/internal/MembersInjectorStore.java
diff --git a/...gle/inject/internal/MessageProcessor.java → ...gle/inject/internal/MessageProcessor.java b/...gle/inject/internal/MessageProcessor.java → ...gle/inject/internal/MessageProcessor.java
diff --git a/.../google/inject/internal/MethodAspect.java → .../google/inject/internal/MethodAspect.java b/.../google/inject/internal/MethodAspect.java → .../google/inject/internal/MethodAspect.java
diff --git a/...com/google/inject/internal/MoreTypes.java → ...com/google/inject/internal/MoreTypes.java b/...com/google/inject/internal/MoreTypes.java → ...com/google/inject/internal/MoreTypes.java
diff --git a/...m/google/inject/internal/Nullability.java → ...m/google/inject/internal/Nullability.java b/...m/google/inject/internal/Nullability.java → ...m/google/inject/internal/Nullability.java
diff --git a/src/com/google/inject/internal/Nullable.java → .../com/google/inject/internal/Nullable.java b/src/com/google/inject/internal/Nullable.java → .../com/google/inject/internal/Nullable.java
diff --git a/...ect/internal/PrivateElementProcessor.java → ...ect/internal/PrivateElementProcessor.java b/...ect/internal/PrivateElementProcessor.java → ...ect/internal/PrivateElementProcessor.java
diff --git a/.../inject/internal/PrivateElementsImpl.java → .../inject/internal/PrivateElementsImpl.java b/.../inject/internal/PrivateElementsImpl.java → .../inject/internal/PrivateElementsImpl.java
diff --git a/...internal/ProviderInstanceBindingImpl.java → ...internal/ProviderInstanceBindingImpl.java b/...internal/ProviderInstanceBindingImpl.java → ...internal/ProviderInstanceBindingImpl.java
diff --git a/...oogle/inject/internal/ProviderMethod.java → ...oogle/inject/internal/ProviderMethod.java b/...oogle/inject/internal/ProviderMethod.java → ...oogle/inject/internal/ProviderMethod.java
diff --git a/...nject/internal/ProviderMethodsModule.java → ...nject/internal/ProviderMethodsModule.java b/...nject/internal/ProviderMethodsModule.java → ...nject/internal/ProviderMethodsModule.java
diff --git a/...nal/ProviderToInternalFactoryAdapter.java → ...nal/ProviderToInternalFactoryAdapter.java b/...nal/ProviderToInternalFactoryAdapter.java → ...nal/ProviderToInternalFactoryAdapter.java
diff --git a/.../google/inject/internal/ProxyFactory.java → .../google/inject/internal/ProxyFactory.java b/.../google/inject/internal/ProxyFactory.java → .../google/inject/internal/ProxyFactory.java
diff --git a/...nject/internal/ScopeBindingProcessor.java → ...nject/internal/ScopeBindingProcessor.java b/...nject/internal/ScopeBindingProcessor.java → ...nject/internal/ScopeBindingProcessor.java
diff --git a/src/com/google/inject/internal/Scoping.java → ...c/com/google/inject/internal/Scoping.java b/src/com/google/inject/internal/Scoping.java → ...c/com/google/inject/internal/Scoping.java
diff --git a/.../inject/internal/SingleFieldInjector.java → .../inject/internal/SingleFieldInjector.java b/.../inject/internal/SingleFieldInjector.java → .../inject/internal/SingleFieldInjector.java
diff --git a/...inject/internal/SingleMemberInjector.java → ...inject/internal/SingleMemberInjector.java b/...inject/internal/SingleMemberInjector.java → ...inject/internal/SingleMemberInjector.java
diff --git a/...inject/internal/SingleMethodInjector.java → ...inject/internal/SingleMethodInjector.java b/...inject/internal/SingleMethodInjector.java → ...inject/internal/SingleMethodInjector.java
diff --git a/...ect/internal/SingleParameterInjector.java → ...ect/internal/SingleParameterInjector.java b/...ect/internal/SingleParameterInjector.java → ...ect/internal/SingleParameterInjector.java
diff --git a/src/com/google/inject/internal/State.java → ...src/com/google/inject/internal/State.java b/src/com/google/inject/internal/State.java → ...src/com/google/inject/internal/State.java
diff --git a/...ternal/TypeConverterBindingProcessor.java → ...ternal/TypeConverterBindingProcessor.java b/...ternal/TypeConverterBindingProcessor.java → ...ternal/TypeConverterBindingProcessor.java
diff --git a/...nternal/TypeListenerBindingProcessor.java → ...nternal/TypeListenerBindingProcessor.java b/...nternal/TypeListenerBindingProcessor.java → ...nternal/TypeListenerBindingProcessor.java
diff --git a/...le/inject/internal/UniqueAnnotations.java → ...le/inject/internal/UniqueAnnotations.java b/...le/inject/internal/UniqueAnnotations.java → ...le/inject/internal/UniqueAnnotations.java
diff --git a/...ject/internal/UntargettedBindingImpl.java → ...ject/internal/UntargettedBindingImpl.java b/...ject/internal/UntargettedBindingImpl.java → ...ject/internal/UntargettedBindingImpl.java
diff --git a/...om/google/inject/internal/WeakKeySet.java → ...om/google/inject/internal/WeakKeySet.java b/...om/google/inject/internal/WeakKeySet.java → ...om/google/inject/internal/WeakKeySet.java
diff --git a/.../google/inject/internal/package-info.java → .../google/inject/internal/package-info.java b/.../google/inject/internal/package-info.java → .../google/inject/internal/package-info.java
diff --git a/...nject/internal/util/AbstractIterator.java → ...nject/internal/util/AbstractIterator.java b/...nject/internal/util/AbstractIterator.java → ...nject/internal/util/AbstractIterator.java
diff --git a/...nject/internal/util/AbstractMapEntry.java → ...nject/internal/util/AbstractMapEntry.java b/...nject/internal/util/AbstractMapEntry.java → ...nject/internal/util/AbstractMapEntry.java
diff --git a/...til/AsynchronousComputationException.java → ...til/AsynchronousComputationException.java b/...til/AsynchronousComputationException.java → ...til/AsynchronousComputationException.java
diff --git a/.../google/inject/internal/util/Classes.java → .../google/inject/internal/util/Classes.java b/.../google/inject/internal/util/Classes.java → .../google/inject/internal/util/Classes.java
diff --git a/...le/inject/internal/util/Collections2.java → ...le/inject/internal/util/Collections2.java b/...le/inject/internal/util/Collections2.java → ...le/inject/internal/util/Collections2.java
diff --git a/...t/internal/util/ComputationException.java → ...t/internal/util/ComputationException.java b/...t/internal/util/ComputationException.java → ...t/internal/util/ComputationException.java
diff --git a/...nternal/util/CustomConcurrentHashMap.java → ...nternal/util/CustomConcurrentHashMap.java b/...nternal/util/CustomConcurrentHashMap.java → ...nternal/util/CustomConcurrentHashMap.java
diff --git a/...inject/internal/util/ExpirationTimer.java → ...inject/internal/util/ExpirationTimer.java b/...inject/internal/util/ExpirationTimer.java → ...inject/internal/util/ExpirationTimer.java
diff --git a/...nal/util/FinalizablePhantomReference.java → ...nal/util/FinalizablePhantomReference.java b/...nal/util/FinalizablePhantomReference.java → ...nal/util/FinalizablePhantomReference.java
diff --git a/...t/internal/util/FinalizableReference.java → ...t/internal/util/FinalizableReference.java b/...t/internal/util/FinalizableReference.java → ...t/internal/util/FinalizableReference.java
diff --git a/...ernal/util/FinalizableReferenceQueue.java → ...ernal/util/FinalizableReferenceQueue.java b/...ernal/util/FinalizableReferenceQueue.java → ...ernal/util/FinalizableReferenceQueue.java
diff --git a/...ternal/util/FinalizableSoftReference.java → ...ternal/util/FinalizableSoftReference.java b/...ternal/util/FinalizableSoftReference.java → ...ternal/util/FinalizableSoftReference.java
diff --git a/...ternal/util/FinalizableWeakReference.java → ...ternal/util/FinalizableWeakReference.java b/...ternal/util/FinalizableWeakReference.java → ...ternal/util/FinalizableWeakReference.java
diff --git a/...oogle/inject/internal/util/Finalizer.java → ...oogle/inject/internal/util/Finalizer.java b/...oogle/inject/internal/util/Finalizer.java → ...oogle/inject/internal/util/Finalizer.java
diff --git a/...google/inject/internal/util/Function.java → ...google/inject/internal/util/Function.java b/...google/inject/internal/util/Function.java → ...google/inject/internal/util/Function.java
diff --git a/.../google/inject/internal/util/Hashing.java → .../google/inject/internal/util/Hashing.java b/.../google/inject/internal/util/Hashing.java → .../google/inject/internal/util/Hashing.java
diff --git a/...ct/internal/util/ImmutableCollection.java → ...ct/internal/util/ImmutableCollection.java b/...ct/internal/util/ImmutableCollection.java → ...ct/internal/util/ImmutableCollection.java
diff --git a/.../inject/internal/util/ImmutableEntry.java → .../inject/internal/util/ImmutableEntry.java b/.../inject/internal/util/ImmutableEntry.java → .../inject/internal/util/ImmutableEntry.java
diff --git a/...e/inject/internal/util/ImmutableList.java → ...e/inject/internal/util/ImmutableList.java b/...e/inject/internal/util/ImmutableList.java → ...e/inject/internal/util/ImmutableList.java
diff --git a/...le/inject/internal/util/ImmutableMap.java → ...le/inject/internal/util/ImmutableMap.java b/...le/inject/internal/util/ImmutableMap.java → ...le/inject/internal/util/ImmutableMap.java
diff --git a/...le/inject/internal/util/ImmutableSet.java → ...le/inject/internal/util/ImmutableSet.java b/...le/inject/internal/util/ImmutableSet.java → ...le/inject/internal/util/ImmutableSet.java
diff --git a/...oogle/inject/internal/util/Iterables.java → ...oogle/inject/internal/util/Iterables.java b/...oogle/inject/internal/util/Iterables.java → ...oogle/inject/internal/util/Iterables.java
diff --git a/...oogle/inject/internal/util/Iterators.java → ...oogle/inject/internal/util/Iterators.java b/...oogle/inject/internal/util/Iterators.java → ...oogle/inject/internal/util/Iterators.java
diff --git a/...com/google/inject/internal/util/Join.java → ...com/google/inject/internal/util/Join.java b/...com/google/inject/internal/util/Join.java → ...com/google/inject/internal/util/Join.java
diff --git a/...gle/inject/internal/util/LineNumbers.java → ...gle/inject/internal/util/LineNumbers.java b/...gle/inject/internal/util/LineNumbers.java → ...gle/inject/internal/util/LineNumbers.java
diff --git a/...om/google/inject/internal/util/Lists.java → ...om/google/inject/internal/util/Lists.java b/...om/google/inject/internal/util/Lists.java → ...om/google/inject/internal/util/Lists.java
diff --git a/...google/inject/internal/util/MapMaker.java → ...google/inject/internal/util/MapMaker.java b/...google/inject/internal/util/MapMaker.java → ...google/inject/internal/util/MapMaker.java
diff --git a/...com/google/inject/internal/util/Maps.java → ...com/google/inject/internal/util/Maps.java b/...com/google/inject/internal/util/Maps.java → ...com/google/inject/internal/util/Maps.java
diff --git a/...ct/internal/util/NullOutputException.java → ...ct/internal/util/NullOutputException.java b/...ct/internal/util/NullOutputException.java → ...ct/internal/util/NullOutputException.java
diff --git a/...le/inject/internal/util/ObjectArrays.java → ...le/inject/internal/util/ObjectArrays.java b/...le/inject/internal/util/ObjectArrays.java → ...le/inject/internal/util/ObjectArrays.java
diff --git a/.../google/inject/internal/util/Objects.java → .../google/inject/internal/util/Objects.java b/.../google/inject/internal/util/Objects.java → .../google/inject/internal/util/Objects.java
diff --git a/...e/inject/internal/util/Preconditions.java → ...e/inject/internal/util/Preconditions.java b/...e/inject/internal/util/Preconditions.java → ...e/inject/internal/util/Preconditions.java
diff --git a/...com/google/inject/internal/util/Sets.java → ...com/google/inject/internal/util/Sets.java b/...com/google/inject/internal/util/Sets.java → ...com/google/inject/internal/util/Sets.java
diff --git a/.../inject/internal/util/SourceProvider.java → .../inject/internal/util/SourceProvider.java b/.../inject/internal/util/SourceProvider.java → .../inject/internal/util/SourceProvider.java
diff --git a/...ect/internal/util/StackTraceElements.java → ...ect/internal/util/StackTraceElements.java b/...ect/internal/util/StackTraceElements.java → ...ect/internal/util/StackTraceElements.java
diff --git a/...oogle/inject/internal/util/Stopwatch.java → ...oogle/inject/internal/util/Stopwatch.java b/...oogle/inject/internal/util/Stopwatch.java → ...oogle/inject/internal/util/Stopwatch.java
diff --git a/.../google/inject/internal/util/Strings.java → .../google/inject/internal/util/Strings.java b/.../google/inject/internal/util/Strings.java → .../google/inject/internal/util/Strings.java
diff --git a/...inject/internal/util/ToStringBuilder.java → ...inject/internal/util/ToStringBuilder.java b/...inject/internal/util/ToStringBuilder.java → ...inject/internal/util/ToStringBuilder.java
diff --git a/...t/internal/util/UnmodifiableIterator.java → ...t/internal/util/UnmodifiableIterator.java b/...t/internal/util/UnmodifiableIterator.java → ...t/internal/util/UnmodifiableIterator.java
diff --git a/...oogle/inject/matcher/AbstractMatcher.java → ...oogle/inject/matcher/AbstractMatcher.java b/...oogle/inject/matcher/AbstractMatcher.java → ...oogle/inject/matcher/AbstractMatcher.java
diff --git a/src/com/google/inject/matcher/Matcher.java → ...rc/com/google/inject/matcher/Matcher.java b/src/com/google/inject/matcher/Matcher.java → ...rc/com/google/inject/matcher/Matcher.java
diff --git a/src/com/google/inject/matcher/Matchers.java → ...c/com/google/inject/matcher/Matchers.java b/src/com/google/inject/matcher/Matchers.java → ...c/com/google/inject/matcher/Matchers.java
diff --git a/...m/google/inject/matcher/package-info.java → ...m/google/inject/matcher/package-info.java b/...m/google/inject/matcher/package-info.java → ...m/google/inject/matcher/package-info.java
diff --git a/src/com/google/inject/name/Named.java → core/src/com/google/inject/name/Named.java b/src/com/google/inject/name/Named.java → core/src/com/google/inject/name/Named.java
diff --git a/src/com/google/inject/name/NamedImpl.java → ...src/com/google/inject/name/NamedImpl.java b/src/com/google/inject/name/NamedImpl.java → ...src/com/google/inject/name/NamedImpl.java
diff --git a/src/com/google/inject/name/Names.java → core/src/com/google/inject/name/Names.java b/src/com/google/inject/name/Names.java → core/src/com/google/inject/name/Names.java
diff --git a/src/com/google/inject/name/package-info.java → .../com/google/inject/name/package-info.java b/src/com/google/inject/name/package-info.java → .../com/google/inject/name/package-info.java
diff --git a/src/com/google/inject/package-info.java → core/src/com/google/inject/package-info.java b/src/com/google/inject/package-info.java → core/src/com/google/inject/package-info.java
diff --git a/...gle/inject/spi/BindingScopingVisitor.java → ...gle/inject/spi/BindingScopingVisitor.java b/...gle/inject/spi/BindingScopingVisitor.java → ...gle/inject/spi/BindingScopingVisitor.java
diff --git a/...ogle/inject/spi/BindingTargetVisitor.java → ...ogle/inject/spi/BindingTargetVisitor.java b/...ogle/inject/spi/BindingTargetVisitor.java → ...ogle/inject/spi/BindingTargetVisitor.java
diff --git a/...google/inject/spi/ConstructorBinding.java → ...google/inject/spi/ConstructorBinding.java b/...google/inject/spi/ConstructorBinding.java → ...google/inject/spi/ConstructorBinding.java
diff --git a/.../inject/spi/ConvertedConstantBinding.java → .../inject/spi/ConvertedConstantBinding.java b/.../inject/spi/ConvertedConstantBinding.java → .../inject/spi/ConvertedConstantBinding.java
diff --git a/...ect/spi/DefaultBindingScopingVisitor.java → ...ect/spi/DefaultBindingScopingVisitor.java b/...ect/spi/DefaultBindingScopingVisitor.java → ...ect/spi/DefaultBindingScopingVisitor.java
diff --git a/...ject/spi/DefaultBindingTargetVisitor.java → ...ject/spi/DefaultBindingTargetVisitor.java b/...ject/spi/DefaultBindingTargetVisitor.java → ...ject/spi/DefaultBindingTargetVisitor.java
diff --git a/...gle/inject/spi/DefaultElementVisitor.java → ...gle/inject/spi/DefaultElementVisitor.java b/...gle/inject/spi/DefaultElementVisitor.java → ...gle/inject/spi/DefaultElementVisitor.java
diff --git a/src/com/google/inject/spi/Dependency.java → ...src/com/google/inject/spi/Dependency.java b/src/com/google/inject/spi/Dependency.java → ...src/com/google/inject/spi/Dependency.java
diff --git a/src/com/google/inject/spi/Element.java → core/src/com/google/inject/spi/Element.java b/src/com/google/inject/spi/Element.java → core/src/com/google/inject/spi/Element.java
diff --git a/...com/google/inject/spi/ElementVisitor.java → ...com/google/inject/spi/ElementVisitor.java b/...com/google/inject/spi/ElementVisitor.java → ...com/google/inject/spi/ElementVisitor.java
diff --git a/src/com/google/inject/spi/Elements.java → core/src/com/google/inject/spi/Elements.java b/src/com/google/inject/spi/Elements.java → core/src/com/google/inject/spi/Elements.java
diff --git a/...com/google/inject/spi/ExposedBinding.java → ...com/google/inject/spi/ExposedBinding.java b/...com/google/inject/spi/ExposedBinding.java → ...com/google/inject/spi/ExposedBinding.java
diff --git a/...om/google/inject/spi/HasDependencies.java → ...om/google/inject/spi/HasDependencies.java b/...om/google/inject/spi/HasDependencies.java → ...om/google/inject/spi/HasDependencies.java
diff --git a/.../google/inject/spi/InjectionListener.java → .../google/inject/spi/InjectionListener.java b/.../google/inject/spi/InjectionListener.java → .../google/inject/spi/InjectionListener.java
diff --git a/...com/google/inject/spi/InjectionPoint.java → ...com/google/inject/spi/InjectionPoint.java b/...com/google/inject/spi/InjectionPoint.java → ...com/google/inject/spi/InjectionPoint.java
diff --git a/...m/google/inject/spi/InjectionRequest.java → ...m/google/inject/spi/InjectionRequest.java b/...m/google/inject/spi/InjectionRequest.java → ...m/google/inject/spi/InjectionRequest.java
diff --git a/...om/google/inject/spi/InstanceBinding.java → ...om/google/inject/spi/InstanceBinding.java b/...om/google/inject/spi/InstanceBinding.java → ...om/google/inject/spi/InstanceBinding.java
diff --git a/...google/inject/spi/InterceptorBinding.java → ...google/inject/spi/InterceptorBinding.java b/...google/inject/spi/InterceptorBinding.java → ...google/inject/spi/InterceptorBinding.java
diff --git a/...m/google/inject/spi/LinkedKeyBinding.java → ...m/google/inject/spi/LinkedKeyBinding.java b/...m/google/inject/spi/LinkedKeyBinding.java → ...m/google/inject/spi/LinkedKeyBinding.java
diff --git a/...gle/inject/spi/MembersInjectorLookup.java → ...gle/inject/spi/MembersInjectorLookup.java b/...gle/inject/spi/MembersInjectorLookup.java → ...gle/inject/spi/MembersInjectorLookup.java
diff --git a/src/com/google/inject/spi/Message.java → core/src/com/google/inject/spi/Message.java b/src/com/google/inject/spi/Message.java → core/src/com/google/inject/spi/Message.java
diff --git a/...om/google/inject/spi/PrivateElements.java → ...om/google/inject/spi/PrivateElements.java b/...om/google/inject/spi/PrivateElements.java → ...om/google/inject/spi/PrivateElements.java
diff --git a/...om/google/inject/spi/ProviderBinding.java → ...om/google/inject/spi/ProviderBinding.java b/...om/google/inject/spi/ProviderBinding.java → ...om/google/inject/spi/ProviderBinding.java
diff --git a/...e/inject/spi/ProviderInstanceBinding.java → ...e/inject/spi/ProviderInstanceBinding.java b/...e/inject/spi/ProviderInstanceBinding.java → ...e/inject/spi/ProviderInstanceBinding.java
diff --git a/...google/inject/spi/ProviderKeyBinding.java → ...google/inject/spi/ProviderKeyBinding.java b/...google/inject/spi/ProviderKeyBinding.java → ...google/inject/spi/ProviderKeyBinding.java
diff --git a/...com/google/inject/spi/ProviderLookup.java → ...com/google/inject/spi/ProviderLookup.java b/...com/google/inject/spi/ProviderLookup.java → ...com/google/inject/spi/ProviderLookup.java
diff --git a/.../inject/spi/ProviderWithDependencies.java → .../inject/spi/ProviderWithDependencies.java b/.../inject/spi/ProviderWithDependencies.java → .../inject/spi/ProviderWithDependencies.java
diff --git a/...ect/spi/ProviderWithExtensionVisitor.java → ...ect/spi/ProviderWithExtensionVisitor.java b/...ect/spi/ProviderWithExtensionVisitor.java → ...ect/spi/ProviderWithExtensionVisitor.java
diff --git a/src/com/google/inject/spi/ScopeBinding.java → ...c/com/google/inject/spi/ScopeBinding.java b/src/com/google/inject/spi/ScopeBinding.java → ...c/com/google/inject/spi/ScopeBinding.java
diff --git a/...le/inject/spi/StaticInjectionRequest.java → ...le/inject/spi/StaticInjectionRequest.java b/...le/inject/spi/StaticInjectionRequest.java → ...le/inject/spi/StaticInjectionRequest.java
diff --git a/src/com/google/inject/spi/Toolable.java → core/src/com/google/inject/spi/Toolable.java b/src/com/google/inject/spi/Toolable.java → core/src/com/google/inject/spi/Toolable.java
diff --git a/src/com/google/inject/spi/TypeConverter.java → .../com/google/inject/spi/TypeConverter.java b/src/com/google/inject/spi/TypeConverter.java → .../com/google/inject/spi/TypeConverter.java
diff --git a/...ogle/inject/spi/TypeConverterBinding.java → ...ogle/inject/spi/TypeConverterBinding.java b/...ogle/inject/spi/TypeConverterBinding.java → ...ogle/inject/spi/TypeConverterBinding.java
diff --git a/src/com/google/inject/spi/TypeEncounter.java → .../com/google/inject/spi/TypeEncounter.java b/src/com/google/inject/spi/TypeEncounter.java → .../com/google/inject/spi/TypeEncounter.java
diff --git a/src/com/google/inject/spi/TypeListener.java → ...c/com/google/inject/spi/TypeListener.java b/src/com/google/inject/spi/TypeListener.java → ...c/com/google/inject/spi/TypeListener.java
diff --git a/...oogle/inject/spi/TypeListenerBinding.java → ...oogle/inject/spi/TypeListenerBinding.java b/...oogle/inject/spi/TypeListenerBinding.java → ...oogle/inject/spi/TypeListenerBinding.java
diff --git a/...google/inject/spi/UntargettedBinding.java → ...google/inject/spi/UntargettedBinding.java b/...google/inject/spi/UntargettedBinding.java → ...google/inject/spi/UntargettedBinding.java
diff --git a/src/com/google/inject/spi/package-info.java → ...c/com/google/inject/spi/package-info.java b/src/com/google/inject/spi/package-info.java → ...c/com/google/inject/spi/package-info.java
diff --git a/src/com/google/inject/util/Jsr330.java → core/src/com/google/inject/util/Jsr330.java b/src/com/google/inject/util/Jsr330.java → core/src/com/google/inject/util/Jsr330.java
diff --git a/src/com/google/inject/util/Modules.java → core/src/com/google/inject/util/Modules.java b/src/com/google/inject/util/Modules.java → core/src/com/google/inject/util/Modules.java
diff --git a/src/com/google/inject/util/Node.java → core/src/com/google/inject/util/Node.java b/src/com/google/inject/util/Node.java → core/src/com/google/inject/util/Node.java
diff --git a/src/com/google/inject/util/Providers.java → ...src/com/google/inject/util/Providers.java b/src/com/google/inject/util/Providers.java → ...src/com/google/inject/util/Providers.java
diff --git a/src/com/google/inject/util/Types.java → core/src/com/google/inject/util/Types.java b/src/com/google/inject/util/Types.java → core/src/com/google/inject/util/Types.java
diff --git a/src/com/google/inject/util/package-info.java → .../com/google/inject/util/package-info.java b/src/com/google/inject/util/package-info.java → .../com/google/inject/util/package-info.java
diff --git a/test/com/google/inject/AllTests.java → core/test/com/google/inject/AllTests.java b/test/com/google/inject/AllTests.java → core/test/com/google/inject/AllTests.java
diff --git a/test/com/google/inject/Asserts.java → core/test/com/google/inject/Asserts.java b/test/com/google/inject/Asserts.java → core/test/com/google/inject/Asserts.java
diff --git a/test/com/google/inject/BinderTest.java → core/test/com/google/inject/BinderTest.java b/test/com/google/inject/BinderTest.java → core/test/com/google/inject/BinderTest.java
diff --git a/test/com/google/inject/BinderTestSuite.java → ...st/com/google/inject/BinderTestSuite.java b/test/com/google/inject/BinderTestSuite.java → ...st/com/google/inject/BinderTestSuite.java
diff --git a/.../google/inject/BindingAnnotationTest.java → .../google/inject/BindingAnnotationTest.java b/.../google/inject/BindingAnnotationTest.java → .../google/inject/BindingAnnotationTest.java
diff --git a/test/com/google/inject/BindingOrderTest.java → ...t/com/google/inject/BindingOrderTest.java b/test/com/google/inject/BindingOrderTest.java → ...t/com/google/inject/BindingOrderTest.java
diff --git a/test/com/google/inject/BindingTest.java → core/test/com/google/inject/BindingTest.java b/test/com/google/inject/BindingTest.java → core/test/com/google/inject/BindingTest.java
diff --git a/...le/inject/BoundInstanceInjectionTest.java → ...le/inject/BoundInstanceInjectionTest.java b/...le/inject/BoundInstanceInjectionTest.java → ...le/inject/BoundInstanceInjectionTest.java
diff --git a/.../com/google/inject/BoundProviderTest.java → .../com/google/inject/BoundProviderTest.java b/.../com/google/inject/BoundProviderTest.java → .../com/google/inject/BoundProviderTest.java
diff --git a/...google/inject/CircularDependencyTest.java → ...google/inject/CircularDependencyTest.java b/...google/inject/CircularDependencyTest.java → ...google/inject/CircularDependencyTest.java
diff --git a/.../google/inject/DuplicateBindingsTest.java → .../google/inject/DuplicateBindingsTest.java b/.../google/inject/DuplicateBindingsTest.java → .../google/inject/DuplicateBindingsTest.java
diff --git a/...com/google/inject/EagerSingletonTest.java → ...com/google/inject/EagerSingletonTest.java b/...com/google/inject/EagerSingletonTest.java → ...com/google/inject/EagerSingletonTest.java
diff --git a/.../com/google/inject/ErrorHandlingTest.java → .../com/google/inject/ErrorHandlingTest.java b/.../com/google/inject/ErrorHandlingTest.java → .../com/google/inject/ErrorHandlingTest.java
diff --git a/...m/google/inject/GenericInjectionTest.java → ...m/google/inject/GenericInjectionTest.java b/...m/google/inject/GenericInjectionTest.java → ...m/google/inject/GenericInjectionTest.java
diff --git a/...om/google/inject/ImplicitBindingTest.java → ...om/google/inject/ImplicitBindingTest.java b/...om/google/inject/ImplicitBindingTest.java → ...om/google/inject/ImplicitBindingTest.java
diff --git a/test/com/google/inject/InjectorTest.java → .../test/com/google/inject/InjectorTest.java b/test/com/google/inject/InjectorTest.java → .../test/com/google/inject/InjectorTest.java
diff --git a/test/com/google/inject/IntegrationTest.java → ...st/com/google/inject/IntegrationTest.java b/test/com/google/inject/IntegrationTest.java → ...st/com/google/inject/IntegrationTest.java
diff --git a/test/com/google/inject/JitBindingsTest.java → ...st/com/google/inject/JitBindingsTest.java b/test/com/google/inject/JitBindingsTest.java → ...st/com/google/inject/JitBindingsTest.java
diff --git a/test/com/google/inject/KeyTest.java → core/test/com/google/inject/KeyTest.java b/test/com/google/inject/KeyTest.java → core/test/com/google/inject/KeyTest.java
diff --git a/...om/google/inject/LoggerInjectionTest.java → ...om/google/inject/LoggerInjectionTest.java b/...om/google/inject/LoggerInjectionTest.java → ...om/google/inject/LoggerInjectionTest.java
diff --git a/...om/google/inject/MembersInjectorTest.java → ...om/google/inject/MembersInjectorTest.java b/...om/google/inject/MembersInjectorTest.java → ...om/google/inject/MembersInjectorTest.java
diff --git a/...google/inject/MethodInterceptionTest.java → ...google/inject/MethodInterceptionTest.java b/...google/inject/MethodInterceptionTest.java → ...google/inject/MethodInterceptionTest.java
diff --git a/test/com/google/inject/ModuleTest.java → core/test/com/google/inject/ModuleTest.java b/test/com/google/inject/ModuleTest.java → core/test/com/google/inject/ModuleTest.java
diff --git a/test/com/google/inject/ModulesTest.java → core/test/com/google/inject/ModulesTest.java b/test/com/google/inject/ModulesTest.java → core/test/com/google/inject/ModulesTest.java
diff --git a/...le/inject/NullableInjectionPointTest.java → ...le/inject/NullableInjectionPointTest.java b/...le/inject/NullableInjectionPointTest.java → ...le/inject/NullableInjectionPointTest.java
diff --git a/...om/google/inject/OptionalBindingTest.java → ...om/google/inject/OptionalBindingTest.java b/...om/google/inject/OptionalBindingTest.java → ...om/google/inject/OptionalBindingTest.java
diff --git a/...com/google/inject/OverrideModuleTest.java → ...com/google/inject/OverrideModuleTest.java b/...com/google/inject/OverrideModuleTest.java → ...com/google/inject/OverrideModuleTest.java
diff --git a/...com/google/inject/ParentInjectorTest.java → ...com/google/inject/ParentInjectorTest.java b/...com/google/inject/ParentInjectorTest.java → ...com/google/inject/ParentInjectorTest.java
diff --git a/.../google/inject/PerformanceComparison.java → .../google/inject/PerformanceComparison.java b/.../google/inject/PerformanceComparison.java → .../google/inject/PerformanceComparison.java
diff --git a/.../com/google/inject/PrivateModuleTest.java → .../com/google/inject/PrivateModuleTest.java b/.../com/google/inject/PrivateModuleTest.java → .../com/google/inject/PrivateModuleTest.java
diff --git a/.../google/inject/ProviderInjectionTest.java → .../google/inject/ProviderInjectionTest.java b/.../google/inject/ProviderInjectionTest.java → .../google/inject/ProviderInjectionTest.java
diff --git a/...google/inject/ProvisionExceptionTest.java → ...google/inject/ProvisionExceptionTest.java b/...google/inject/ProvisionExceptionTest.java → ...google/inject/ProvisionExceptionTest.java
diff --git a/...oogle/inject/ProvisionExceptionsTest.java → ...oogle/inject/ProvisionExceptionsTest.java b/...oogle/inject/ProvisionExceptionsTest.java → ...oogle/inject/ProvisionExceptionsTest.java
diff --git a/test/com/google/inject/ReflectionTest.java → ...est/com/google/inject/ReflectionTest.java b/test/com/google/inject/ReflectionTest.java → ...est/com/google/inject/ReflectionTest.java
diff --git a/...m/google/inject/RequestInjectionTest.java → ...m/google/inject/RequestInjectionTest.java b/...m/google/inject/RequestInjectionTest.java → ...m/google/inject/RequestInjectionTest.java
diff --git a/test/com/google/inject/ScopesTest.java → core/test/com/google/inject/ScopesTest.java b/test/com/google/inject/ScopesTest.java → core/test/com/google/inject/ScopesTest.java
diff --git a/.../com/google/inject/SerializationTest.java → .../com/google/inject/SerializationTest.java b/.../com/google/inject/SerializationTest.java → .../com/google/inject/SerializationTest.java
diff --git a/test/com/google/inject/SuperclassTest.java → ...est/com/google/inject/SuperclassTest.java b/test/com/google/inject/SuperclassTest.java → ...est/com/google/inject/SuperclassTest.java
diff --git a/...com/google/inject/TypeConversionTest.java → ...com/google/inject/TypeConversionTest.java b/...com/google/inject/TypeConversionTest.java → ...com/google/inject/TypeConversionTest.java
diff --git a/test/com/google/inject/TypeListenerTest.java → ...t/com/google/inject/TypeListenerTest.java b/test/com/google/inject/TypeListenerTest.java → ...t/com/google/inject/TypeListenerTest.java
diff --git a/...ogle/inject/TypeLiteralInjectionTest.java → ...ogle/inject/TypeLiteralInjectionTest.java b/...ogle/inject/TypeLiteralInjectionTest.java → ...ogle/inject/TypeLiteralInjectionTest.java
diff --git a/test/com/google/inject/TypeLiteralTest.java → ...st/com/google/inject/TypeLiteralTest.java b/test/com/google/inject/TypeLiteralTest.java → ...st/com/google/inject/TypeLiteralTest.java
diff --git a/...inject/TypeLiteralTypeResolutionTest.java → ...inject/TypeLiteralTypeResolutionTest.java b/...inject/TypeLiteralTypeResolutionTest.java → ...inject/TypeLiteralTypeResolutionTest.java
diff --git a/...ClientServiceWithDependencyInjection.java → ...ClientServiceWithDependencyInjection.java b/...ClientServiceWithDependencyInjection.java → ...ClientServiceWithDependencyInjection.java
diff --git a/...t/example/ClientServiceWithFactories.java → ...t/example/ClientServiceWithFactories.java b/...t/example/ClientServiceWithFactories.java → ...t/example/ClientServiceWithFactories.java
diff --git a/...nject/example/ClientServiceWithGuice.java → ...nject/example/ClientServiceWithGuice.java b/...nject/example/ClientServiceWithGuice.java → ...nject/example/ClientServiceWithGuice.java
diff --git a/...ample/ClientServiceWithGuiceDefaults.java → ...ample/ClientServiceWithGuiceDefaults.java b/...ample/ClientServiceWithGuiceDefaults.java → ...ample/ClientServiceWithGuiceDefaults.java
diff --git a/...m/google/inject/example/JndiProvider.java → ...m/google/inject/example/JndiProvider.java b/...m/google/inject/example/JndiProvider.java → ...m/google/inject/example/JndiProvider.java
diff --git a/...le/inject/example/JndiProviderClient.java → ...le/inject/example/JndiProviderClient.java b/...le/inject/example/JndiProviderClient.java → ...le/inject/example/JndiProviderClient.java
diff --git a/...google/inject/internal/MoreTypesTest.java → ...google/inject/internal/MoreTypesTest.java b/...google/inject/internal/MoreTypesTest.java → ...google/inject/internal/MoreTypesTest.java
diff --git a/...gle/inject/internal/ProxyFactoryTest.java → ...gle/inject/internal/ProxyFactoryTest.java b/...gle/inject/internal/ProxyFactoryTest.java → ...gle/inject/internal/ProxyFactoryTest.java
diff --git a/...nject/internal/UniqueAnnotationsTest.java → ...nject/internal/UniqueAnnotationsTest.java b/...nject/internal/UniqueAnnotationsTest.java → ...nject/internal/UniqueAnnotationsTest.java
diff --git a/...l/util/FinalizableReferenceQueueTest.java → ...l/util/FinalizableReferenceQueueTest.java b/...l/util/FinalizableReferenceQueueTest.java → ...l/util/FinalizableReferenceQueueTest.java
diff --git a/...t/internal/util/ForwardingCollection.java → ...t/internal/util/ForwardingCollection.java b/...t/internal/util/ForwardingCollection.java → ...t/internal/util/ForwardingCollection.java
diff --git a/...nternal/util/ForwardingConcurrentMap.java → ...nternal/util/ForwardingConcurrentMap.java b/...nternal/util/ForwardingConcurrentMap.java → ...nternal/util/ForwardingConcurrentMap.java
diff --git a/...e/inject/internal/util/ForwardingMap.java → ...e/inject/internal/util/ForwardingMap.java b/...e/inject/internal/util/ForwardingMap.java → ...e/inject/internal/util/ForwardingMap.java
diff --git a/...nject/internal/util/ForwardingObject.java → ...nject/internal/util/ForwardingObject.java b/...nject/internal/util/ForwardingObject.java → ...nject/internal/util/ForwardingObject.java
diff --git a/...e/inject/internal/util/ForwardingSet.java → ...e/inject/internal/util/ForwardingSet.java b/...e/inject/internal/util/ForwardingSet.java → ...e/inject/internal/util/ForwardingSet.java
diff --git a/...e/inject/internal/util/Jsr166HashMap.java → ...e/inject/internal/util/Jsr166HashMap.java b/...e/inject/internal/util/Jsr166HashMap.java → ...e/inject/internal/util/Jsr166HashMap.java
diff --git a/...ject/internal/util/Jsr166HashMapTest.java → ...ject/internal/util/Jsr166HashMapTest.java b/...ject/internal/util/Jsr166HashMapTest.java → ...ject/internal/util/Jsr166HashMapTest.java
diff --git a/...inject/internal/util/LineNumbersTest.java → ...inject/internal/util/LineNumbersTest.java b/...inject/internal/util/LineNumbersTest.java → ...inject/internal/util/LineNumbersTest.java
diff --git a/...ject/internal/util/MapMakerTestSuite.java → ...ject/internal/util/MapMakerTestSuite.java b/...ject/internal/util/MapMakerTestSuite.java → ...ject/internal/util/MapMakerTestSuite.java
diff --git a/...om/google/inject/matcher/MatcherTest.java → ...om/google/inject/matcher/MatcherTest.java b/...om/google/inject/matcher/MatcherTest.java → ...om/google/inject/matcher/MatcherTest.java
diff --git a/...gle/inject/name/NamedEquivalanceTest.java → ...gle/inject/name/NamedEquivalanceTest.java b/...gle/inject/name/NamedEquivalanceTest.java → ...gle/inject/name/NamedEquivalanceTest.java
diff --git a/test/com/google/inject/name/NamesTest.java → ...est/com/google/inject/name/NamesTest.java b/test/com/google/inject/name/NamesTest.java → ...est/com/google/inject/name/NamesTest.java
diff --git a/.../inject/spi/BindingTargetVisitorTest.java → .../inject/spi/BindingTargetVisitorTest.java b/.../inject/spi/BindingTargetVisitorTest.java → .../inject/spi/BindingTargetVisitorTest.java
diff --git a/...google/inject/spi/ElementApplyToTest.java → ...google/inject/spi/ElementApplyToTest.java b/...google/inject/spi/ElementApplyToTest.java → ...google/inject/spi/ElementApplyToTest.java
diff --git a/test/com/google/inject/spi/ElementsTest.java → ...t/com/google/inject/spi/ElementsTest.java b/test/com/google/inject/spi/ElementsTest.java → ...t/com/google/inject/spi/ElementsTest.java
diff --git a/...ect/spi/FailingBindingScopingVisitor.java → ...ect/spi/FailingBindingScopingVisitor.java b/...ect/spi/FailingBindingScopingVisitor.java → ...ect/spi/FailingBindingScopingVisitor.java
diff --git a/...gle/inject/spi/FailingElementVisitor.java → ...gle/inject/spi/FailingElementVisitor.java b/...gle/inject/spi/FailingElementVisitor.java → ...gle/inject/spi/FailingElementVisitor.java
diff --git a/...ogle/inject/spi/FailingTargetVisitor.java → ...ogle/inject/spi/FailingTargetVisitor.java b/...ogle/inject/spi/FailingTargetVisitor.java → ...ogle/inject/spi/FailingTargetVisitor.java
diff --git a/...oogle/inject/spi/HasDependenciesTest.java → ...oogle/inject/spi/HasDependenciesTest.java b/...oogle/inject/spi/HasDependenciesTest.java → ...oogle/inject/spi/HasDependenciesTest.java
diff --git a/...google/inject/spi/InjectionPointTest.java → ...google/inject/spi/InjectionPointTest.java b/...google/inject/spi/InjectionPointTest.java → ...google/inject/spi/InjectionPointTest.java
diff --git a/...om/google/inject/spi/InjectorSpiTest.java → ...om/google/inject/spi/InjectorSpiTest.java b/...om/google/inject/spi/InjectorSpiTest.java → ...om/google/inject/spi/InjectorSpiTest.java
diff --git a/...google/inject/spi/ModuleRewriterTest.java → ...google/inject/spi/ModuleRewriterTest.java b/...google/inject/spi/ModuleRewriterTest.java → ...google/inject/spi/ModuleRewriterTest.java
diff --git a/...oogle/inject/spi/ProviderMethodsTest.java → ...oogle/inject/spi/ProviderMethodsTest.java b/...oogle/inject/spi/ProviderMethodsTest.java → ...oogle/inject/spi/ProviderMethodsTest.java
diff --git a/...om/google/inject/spi/SpiBindingsTest.java → ...om/google/inject/spi/SpiBindingsTest.java b/...om/google/inject/spi/SpiBindingsTest.java → ...om/google/inject/spi/SpiBindingsTest.java
diff --git a/...gle/inject/spi/ToolStageInjectorTest.java → ...gle/inject/spi/ToolStageInjectorTest.java b/...gle/inject/spi/ToolStageInjectorTest.java → ...gle/inject/spi/ToolStageInjectorTest.java
diff --git a/.../google/inject/util/NoopOverrideTest.java → .../google/inject/util/NoopOverrideTest.java b/.../google/inject/util/NoopOverrideTest.java → .../google/inject/util/NoopOverrideTest.java
diff --git a/...com/google/inject/util/ProvidersTest.java → ...com/google/inject/util/ProvidersTest.java b/...com/google/inject/util/ProvidersTest.java → ...com/google/inject/util/ProvidersTest.java
diff --git a/test/com/google/inject/util/TypesTest.java → ...est/com/google/inject/util/TypesTest.java b/test/com/google/inject/util/TypesTest.java → ...est/com/google/inject/util/TypesTest.java
diff --git a/...com/googlecode/guice/BytecodeGenTest.java → ...com/googlecode/guice/BytecodeGenTest.java b/...com/googlecode/guice/BytecodeGenTest.java → ...com/googlecode/guice/BytecodeGenTest.java
diff --git a/test/com/googlecode/guice/GuiceTck.java → core/test/com/googlecode/guice/GuiceTck.java b/test/com/googlecode/guice/GuiceTck.java → core/test/com/googlecode/guice/GuiceTck.java
diff --git a/test/com/googlecode/guice/Jsr330Test.java → ...test/com/googlecode/guice/Jsr330Test.java b/test/com/googlecode/guice/Jsr330Test.java → ...test/com/googlecode/guice/Jsr330Test.java
diff --git a/...m/googlecode/guice/OSGiContainerTest.java → ...m/googlecode/guice/OSGiContainerTest.java b/...m/googlecode/guice/OSGiContainerTest.java → ...m/googlecode/guice/OSGiContainerTest.java
diff --git a/...de/guice/PackageVisibilityTestModule.java → ...de/guice/PackageVisibilityTestModule.java b/...de/guice/PackageVisibilityTestModule.java → ...de/guice/PackageVisibilityTestModule.java
diff --git a/...ecode/guice/StrictContainerTestSuite.java → ...ecode/guice/StrictContainerTestSuite.java b/...ecode/guice/StrictContainerTestSuite.java → ...ecode/guice/StrictContainerTestSuite.java
diff --git a/...uice/StrictContainerTestSuiteBuilder.java → ...uice/StrictContainerTestSuiteBuilder.java b/...uice/StrictContainerTestSuiteBuilder.java → ...uice/StrictContainerTestSuiteBuilder.java
diff --git a/...ecode/guice/bundle/OSGiTestActivator.java → ...ecode/guice/bundle/OSGiTestActivator.java b/...ecode/guice/bundle/OSGiTestActivator.java → ...ecode/guice/bundle/OSGiTestActivator.java
diff --git a/guice.iml b/guice.iml
@@ -3,8 +3,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/core/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/core/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/classes" />
       <excludeFolder url="file://$MODULE_DIR$/javadoc" />