--- a/src/abbrev.stc	Sat Dec 03 21:05:52 2011 +0000
+++ b/src/abbrev.stc	Sat Dec 03 22:02:52 2011 +0000
@@ -1,5 +1,4 @@
 AbstractJavaTestCase AbstractJavaTestCase stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaByte JavaByte stx:libjava 'Languages-Java-Support' 0
 JUnitTestCaseProxy JUnitTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
 Java Java stx:libjava 'Languages-Java-Support' 0
 JavaAnnotation JavaAnnotation stx:libjava 'Languages-Java-Reader-Support' 0
@@ -9,16 +8,18 @@
 JavaAnnotationValue JavaAnnotationValue stx:libjava 'Languages-Java-Reader-Support' 0
 JavaAntProjectResource JavaAntProjectResource stx:libjava 'Languages-Java-Tests' 2
 JavaArray JavaArray stx:libjava 'Languages-Java-Classes' 1
-JavaBehavior JavaBehavior stx:libjava 'Languages-Java-Classes' 0
+JavaByte JavaByte stx:libjava 'Languages-Java-Support' 0
 JavaByteCodeDisassemblerTests JavaByteCodeDisassemblerTests stx:libjava 'Languages-Java-Tests' 1
 JavaByteCodeInterpreterTests JavaByteCodeInterpreterTests stx:libjava 'Languages-Java-Tests' 1
 JavaByteCodeProcessor JavaByteCodeProcessor stx:libjava 'Languages-Java-Bytecode' 0
 JavaByteCodeProcessorTests JavaByteCodeProcessorTests stx:libjava 'Languages-Java-Tests' 1
-JavaClassReader JavaClassReader stx:libjava 'Languages-Java-Support' 0
+JavaClassLoadingTests JavaClassLoadingTests stx:libjava 'Languages-Java-Tests-ClassLoading' 1
 JavaClassReader2Tests JavaClassReader2Tests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
 JavaClassReaderTests JavaClassReaderTests stx:libjava 'Languages-Java-Tests' 1
 JavaClassRefTests JavaClassRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
+JavaClassRegistry JavaClassRegistry stx:libjava 'Languages-Java-Support' 0
 JavaConstantPool JavaConstantPool stx:libjava 'Languages-Java-Reader-Support' 0
+JavaConstants JavaConstants stx:libjava 'Languages-Java-Support' 0
 JavaContext JavaContext stx:libjava 'Languages-Java-Support' 0
 JavaDecompiler JavaDecompiler stx:libjava 'Languages-Java-Support-Decompiling' 0
 JavaDescriptor JavaDescriptor stx:libjava 'Languages-Java-Support' 0
@@ -28,6 +29,7 @@
 JavaExceptionThrowerMock JavaExceptionThrowerMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
 JavaField JavaField stx:libjava 'Languages-Java-Reader-Support' 0
 JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
+JavaFreshlyInitializedResource JavaFreshlyInitializedResource stx:libjava 'Languages-Java-Tests' 1
 JavaInitializedResource JavaInitializedResource stx:libjava 'Languages-Java-Tests' 2
 JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
 JavaJUnitTests JavaJUnitTests stx:libjava 'Languages-Java-Tests-Libraries' 1
@@ -37,12 +39,12 @@
 JavaLibrariesResource JavaLibrariesResource stx:libjava 'Languages-Java-Tests' 1
 JavaLocalVariableTable JavaLocalVariableTable stx:libjava 'Languages-Java-Support' 0
 JavaLocalVariableTableEntry JavaLocalVariableTableEntry stx:libjava 'Languages-Java-Support' 0
-JavaLookup JavaLookup stx:libjava 'Languages-Java-Experiments-Lookup' 0
 JavaMathSupport JavaMathSupport stx:libjava 'Languages-Java-Support-Native' 0
-JavaMethod JavaMethod stx:libjava 'Languages-Java-Classes' 0
 JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
+JavaMonitor JavaMonitor stx:libjava 'Languages-Java-Support' 0
+JavaMonitorsTests JavaMonitorsTests stx:libjava 'Languages-Java-Tests-Synchronization' 1
 JavaNameAndType2 JavaNameAndType2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaNativeMemory JavaNativeMemory stx:libjava 'Languages-Java-Support-Native' 0
+JavaNativeMemory JavaNativeMemory stx:libjava 'Languages-Java-Support' 0
 JavaNode JavaNode stx:libjava 'Languages-Java-AST' 0
 JavaObject JavaObject stx:libjava 'Languages-Java-Classes' 0
 JavaObjectDictionary JavaObjectDictionary stx:libjava 'Languages-Java-Support' 0
@@ -59,8 +61,10 @@
 JavaRelease JavaRelease stx:libjava 'Languages-Java-Support' 0
 JavaResolver JavaResolver stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaSelectorParserTests JavaSelectorParserTests stx:libjava 'Languages-Java-Experiments-Tests' 1
+JavaSelectorParserTests JavaSelectorParserTests stx:libjava 'Languages-Java-Lookup-Tests' 1
+JavaShort JavaShort stx:libjava 'Languages-Java-Support' 0
 JavaSlotIndexCache JavaSlotIndexCache stx:libjava 'Languages-Java-Support' 0
+JavaSocket JavaSocket stx:libjava 'Languages-Java-Support' 0
 JavaSourceCodeCache JavaSourceCodeCache stx:libjava 'Languages-Java-Support' 1
 JavaSourceFileWriter JavaSourceFileWriter stx:libjava 'Languages-Java-Support' 0
 JavaStartup JavaStartup stx:libjava 'Languages-Java-Support' 1
@@ -68,27 +72,18 @@
 JavaTestsLoader JavaTestsLoader stx:libjava 'Languages-Java-Tests' 0
 JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 2
 JavaTopView JavaTopView stx:libjava 'Languages-Java-Views-Support' 2
-JavaTypeBox JavaTypeBox stx:libjava 'Languages-Java-Experiments-Types' 0
 JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 1
 JavaUnresolvedConstant JavaUnresolvedConstant stx:libjava 'Languages-Java-Reader-Support' 0
-JavaVM JavaVM stx:libjava 'Languages-Java-Support' 0
 JavaView JavaView stx:libjava 'Languages-Java-Views-Support' 2
-JavaZipSupport JavaZipSupport stx:libjava 'Languages-Java-Support-Native' 0
-LookupIntegrationTests LookupIntegrationTests stx:libjava 'Languages-Java-Experiments-Tests' 1
-LookupIntegrationTestsResource LookupIntegrationTestsResource stx:libjava 'Languages-Java-Experiments-Tests' 3
-LookupTests LookupTests stx:libjava 'Languages-Java-Experiments-Tests' 1
-MessageDescription MessageDescription stx:libjava 'Languages-Java-Experiments-Lookup' 0
-NoOpTypeBox NoOpTypeBox stx:libjava 'Languages-Java-Experiments-Types' 0
+JavaZipSupport JavaZipSupport stx:libjava 'Languages-Java-Support' 0
+LookupIntegrationTests LookupIntegrationTests stx:libjava 'Languages-Java-Lookup-Tests' 1
+LookupIntegrationTestsResource LookupIntegrationTestsResource stx:libjava 'Languages-Java-Lookup-Tests' 3
+LookupTests LookupTests stx:libjava 'Languages-Java-Lookup-Tests' 1
+MPXJTests MPXJTests stx:libjava 'Languages-Java-Tests-Libraries' 1
 PPJavaNode PPJavaNode stx:libjava 'Languages-Java-AST' 0
-PersonSample PersonSample stx:libjava 'Languages-Java-Experiments-Tests' 0
-SampleHandler SampleHandler stx:libjava 'Languages-Java-Experiments-Tests' 0
-SelectorParser SelectorParser stx:libjava 'Languages-Java-Experiments-Lookup' 0
-SetSample SetSample stx:libjava 'Languages-Java-Experiments-Tests' 0
-JavaShort JavaShort stx:libjava 'Languages-Java-Support' 0
 SmalltalkAppletContext SmalltalkAppletContext stx:libjava 'Languages-Java-Views-Support' 0
 SmalltalkAppletStub SmalltalkAppletStub stx:libjava 'Languages-Java-Views-Support' 0
-SmalltalkLookup SmalltalkLookup stx:libjava 'Languages-Java-Experiments-Lookup' 0
-SmalltalkSelectorParserTests SmalltalkSelectorParserTests stx:libjava 'Languages-Java-Experiments-Tests' 1
+SmalltalkSelectorParserTests SmalltalkSelectorParserTests stx:libjava 'Languages-Java-Lookup-Tests' 1
 TestletTestCaseProxy TestletTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
 stx_libjava stx_libjava stx:libjava '* Projects & Packages *' 3
 JavaAnnotationArrayValue JavaAnnotationArrayValue stx:libjava 'Languages-Java-Reader-Support' 0
@@ -96,44 +91,39 @@
 JavaAnnotationEnumValue JavaAnnotationEnumValue stx:libjava 'Languages-Java-Reader-Support' 0
 JavaAnnotationNestedAnnotationValue JavaAnnotationNestedAnnotationValue stx:libjava 'Languages-Java-Reader-Support' 0
 JavaAnnotationPrimitiveValue JavaAnnotationPrimitiveValue stx:libjava 'Languages-Java-Reader-Support' 0
-JavaBoolBox JavaBoolBox stx:libjava 'Languages-Java-Experiments-Types' 0
-JavaBooleanBox JavaBooleanBox stx:libjava 'Languages-Java-Experiments-Types' 0
+JavaBehavior JavaBehavior stx:libjava 'Languages-Java-Classes' 0
 JavaByteCodeDisassembler JavaByteCodeDisassembler stx:libjava 'Languages-Java-Bytecode' 0
 JavaByteCodeEnumerator JavaByteCodeEnumerator stx:libjava 'Languages-Java-Support-Decompiling' 0
 JavaByteCodeInterpreter JavaByteCodeInterpreter stx:libjava 'Languages-Java-Bytecode' 0
-JavaClass JavaClass stx:libjava 'Languages-Java-Classes' 0
 JavaClassAnnotationContainer JavaClassAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
 JavaClassContentRef2 JavaClassContentRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
+JavaClassReader JavaClassReader stx:libjava 'Languages-Java-Support' 0
 JavaClassRef2 JavaClassRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaEmbeddedFrameView JavaEmbeddedFrameView stx:libjava 'Languages-Java-Views-Support' 2
 JavaFieldAnnotationContainer JavaFieldAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
 JavaFieldDescriptor JavaFieldDescriptor stx:libjava 'Languages-Java-Support' 0
 JavaFormalParameterNode JavaFormalParameterNode stx:libjava 'Languages-Java-AST' 0
-JavaIntegerBox JavaIntegerBox stx:libjava 'Languages-Java-Experiments-Types' 0
 JavaInvalidRefError JavaInvalidRefError stx:libjava 'Languages-Java-Support' 1
+JavaMethod JavaMethod stx:libjava 'Languages-Java-Classes' 0
 JavaMethodAnnotationContainer JavaMethodAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
 JavaMethodDeclarationNode JavaMethodDeclarationNode stx:libjava 'Languages-Java-AST' 0
 JavaMethodDeclaratorNode JavaMethodDeclaratorNode stx:libjava 'Languages-Java-AST' 0
 JavaMethodDescriptor JavaMethodDescriptor stx:libjava 'Languages-Java-Support' 0
 JavaMethodNode JavaMethodNode stx:libjava 'Languages-Java-AST' 0
-JavaMethodWithException JavaMethodWithException stx:libjava 'Languages-Java-Classes' 0
 JavaParser JavaParser stx:libjava 'Languages-Java-Parser' 0
-JavaSelectorParser JavaSelectorParser stx:libjava 'Languages-Java-Experiments-Lookup' 0
-JavaStringBox JavaStringBox stx:libjava 'Languages-Java-Experiments-Types' 0
 JavaStringRef2 JavaStringRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaTypeNode JavaTypeNode stx:libjava 'Languages-Java-AST' 0
 JavaUnhandledExceptionError JavaUnhandledExceptionError stx:libjava 'Languages-Java-Support' 1
 JavaUnresolvedClassConstant JavaUnresolvedClassConstant stx:libjava 'Languages-Java-Reader-Support' 0
 JavaUnresolvedStringConstant JavaUnresolvedStringConstant stx:libjava 'Languages-Java-Reader-Support' 0
+JavaVM JavaVM stx:libjava 'Languages-Java-Support' 0
 JavadocDeclarationNode JavadocDeclarationNode stx:libjava 'Languages-Java-AST' 0
-SetBox SetBox stx:libjava 'Languages-Java-Experiments-Types' 0
-SmalltalkSelectorParser SmalltalkSelectorParser stx:libjava 'Languages-Java-Experiments-Lookup' 0
-VoidBox VoidBox stx:libjava 'Languages-Java-Experiments-Types' 0
 JavaArrayTypeNode JavaArrayTypeNode stx:libjava 'Languages-Java-AST' 0
 JavaBooleanTypeNode JavaBooleanTypeNode stx:libjava 'Languages-Java-AST' 0
 JavaBothOldAndNewClassRef JavaBothOldAndNewClassRef stx:libjava 'Languages-Java-Reader-Support-new' 0
 JavaByteCodeSteppableInterpreter JavaByteCodeSteppableInterpreter stx:libjava 'Languages-Java-Bytecode' 0
 JavaCharTypeNode JavaCharTypeNode stx:libjava 'Languages-Java-AST' 0
+JavaClass JavaClass stx:libjava 'Languages-Java-Classes' 0
 JavaClassOrInterfaceTypeNode JavaClassOrInterfaceTypeNode stx:libjava 'Languages-Java-AST' 0
 JavaDoubleTypeNode JavaDoubleTypeNode stx:libjava 'Languages-Java-AST' 0
 JavaFieldRef2 JavaFieldRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
@@ -141,16 +131,8 @@
 JavaIntTypeNode JavaIntTypeNode stx:libjava 'Languages-Java-AST' 0
 JavaLongTypeNode JavaLongTypeNode stx:libjava 'Languages-Java-AST' 0
 JavaMethodRef2 JavaMethodRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
-JavaMethodWithHandler JavaMethodWithHandler stx:libjava 'Languages-Java-Classes' 0
+JavaMethodWithException JavaMethodWithException stx:libjava 'Languages-Java-Classes' 0
 JavaVoidTypeNode JavaVoidTypeNode stx:libjava 'Languages-Java-AST' 0
 JavaInterfaceMethodRef2 JavaInterfaceMethodRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
+JavaMethodWithHandler JavaMethodWithHandler stx:libjava 'Languages-Java-Classes' 0
 JavaNativeMethod JavaNativeMethod stx:libjava 'Languages-Java-Classes' 0
-JavaClassLoadingTests JavaClassLoadingTests stx:libjava 'Languages-Java-Tests-ClassLoading' 1
-JavaFreshlyInitializedResource JavaFreshlyInitializedResource stx:libjava 'Languages-Java-Tests' 1
-JavaClassRegistry JavaClassRegistry stx:libjava 'Languages-Java-Support' 0
-JavaConstants JavaConstants stx:libjava 'Languages-Java-Support' 0
-JavaSocket JavaSocket stx:libjava 'Languages-Java-Support' 0
-JavaMonitor JavaMonitor stx:libjava 'Languages-Java-Support' 0
-JavaMonitorsTests JavaMonitorsTests stx:libjava 'Languages-Java-Tests-Synchronization' 1
-MPXJTests MPXJTests stx:libjava 'Languages-Java-Tests-Libraries' 1
-JavaMethodWrapperCompiler JavaMethodWrapperCompiler stx:libjava 'Languages-Java-Experiments-Lookup' 0