--- a/LLVM.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVM.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Internal'
+	category:'LLVM-S-Internal'
 !
 
 

--- a/LLVMAtomicOrdering.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMAtomicOrdering.st	Sat Aug 01 06:21:29 2015 +0100
@@ -9,7 +9,7 @@
 		LLVMAtomicOrderingRelease LLVMAtomicOrderingAcquireRelease
 		LLVMAtomicOrderingSequentiallyConsistent'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMAtomicOrdering class methodsFor:'initialization'!

--- a/LLVMAtomicRMWBinOp.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMAtomicRMWBinOp.st	Sat Aug 01 06:21:29 2015 +0100
@@ -10,9 +10,10 @@
 		LLVMAtomicRMWBinOpMax LLVMAtomicRMWBinOpMin
 		LLVMAtomicRMWBinOpUMax LLVMAtomicRMWBinOpUMin'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
+
 !LLVMAtomicRMWBinOp class methodsFor:'initialization'!
 
 initialize
@@ -87,5 +88,12 @@
     ^LLVMAtomicRMWBinOpXor
 ! !
 
+!LLVMAtomicRMWBinOp class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
 
 LLVMAtomicRMWBinOp initialize!

--- a/LLVMAttribute.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMAttribute.st	Sat Aug 01 06:21:29 2015 +0100
@@ -15,7 +15,7 @@
 		LLVMInlineHintAttribute LLVMStackAlignment LLVMReturnsTwice
 		LLVMUWTable LLVMNonLazyBind'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMAttribute class methodsFor:'initialization'!

--- a/LLVMBasicBlock.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMBasicBlock.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:'module'
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 !LLVMBasicBlock methodsFor:'accessing'!

--- a/LLVMBuilder.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMBuilder.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 

--- a/LLVMByteOrdering.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMByteOrdering.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:'LLVMBigEndian LLVMLittleEndian'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMByteOrdering class methodsFor:'initialization'!

--- a/LLVMCallConv.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMCallConv.st	Sat Aug 01 06:21:29 2015 +0100
@@ -8,7 +8,7 @@
 		LLVMWebKitJSCallConv LLVMAnyRegCallConv LLVMX86StdcallCallConv
 		LLVMX86FastcallCallConv'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMCallConv class methodsFor:'initialization'!

--- a/LLVMContext.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMContext.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,6 +6,6 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 

--- a/LLVMDLLStorageClass.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMDLLStorageClass.st	Sat Aug 01 06:21:29 2015 +0100
@@ -7,7 +7,7 @@
 	classVariableNames:'LLVMDefaultStorageClass LLVMDLLImportStorageClass
 		LLVMDLLExportStorageClass'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMDLLStorageClass class methodsFor:'initialization'!

--- a/LLVMDiagnosticInfo.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMDiagnosticInfo.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,6 +6,6 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 

--- a/LLVMDiagnosticSeverity.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMDiagnosticSeverity.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:'LLVMDSError LLVMDSWarning LLVMDSRemark LLVMDSNote'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMDiagnosticSeverity class methodsFor:'initialization'!

--- a/LLVMDisposableObject.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMDisposableObject.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Internal'
+	category:'LLVM-S-Internal'
 !
 
 

--- a/LLVMExamples.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMExamples.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core-Examples'
+	category:'LLVM-S-Core-Examples'
 !
 
 

--- a/LLVMExecutionEngine.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMExecutionEngine.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:'module'
 	classVariableNames:'Initialized'
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 

--- a/LLVMFunction.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMFunction.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:'numArgs'
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 !LLVMFunction methodsFor:'accessing'!

--- a/LLVMGenericValue.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMGenericValue.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 !LLVMGenericValue methodsFor:'initialization & release'!

--- a/LLVMIntPredicate.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMIntPredicate.st	Sat Aug 01 06:21:29 2015 +0100
@@ -7,7 +7,7 @@
 	classVariableNames:'LLVMIntEQ LLVMIntNE LLVMIntUGT LLVMIntUGE LLVMIntULT LLVMIntULE
 		LLVMIntSGT LLVMIntSGE LLVMIntSLT LLVMIntSLE'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMIntPredicate class methodsFor:'initialization'!

--- a/LLVMLandingPadClauseTy.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMLandingPadClauseTy.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:'LLVMLandingPadCatch LLVMLandingPadFilter'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 

--- a/LLVMLinkage.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMLinkage.st	Sat Aug 01 06:21:29 2015 +0100
@@ -12,7 +12,7 @@
 		LLVMExternalWeakLinkage LLVMGhostLinkage LLVMCommonLinkage
 		LLVMLinkerPrivateLinkage LLVMLinkerPrivateWeakLinkage'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMLinkage class methodsFor:'initialization'!

--- a/LLVMMCJITCompilerOptions.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMMCJITCompilerOptions.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 !LLVMMCJITCompilerOptions class methodsFor:'accessing'!

--- a/LLVMMCJITMemoryManager.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMMCJITMemoryManager.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 !LLVMMCJITMemoryManager methodsFor:'initialization & release'!

--- a/LLVMModule.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMModule.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:'LLVMTypeKind'
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 !LLVMModule class methodsFor:'instance creation'!

--- a/LLVMModuleProvider.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMModuleProvider.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 !LLVMModuleProvider methodsFor:'initialization & release'!

--- a/LLVMObject.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMObject.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,6 +6,6 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Internal'
+	category:'LLVM-S-Internal'
 !
 

--- a/LLVMObjectArray.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMObjectArray.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 !LLVMObjectArray class methodsFor:'instance creation'!

--- a/LLVMOpcode.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMOpcode.st	Sat Aug 01 06:21:29 2015 +0100
@@ -16,7 +16,7 @@
 		LLVMExtractValue LLVMInsertValue LLVMFence LLVMAtomicCmpXchg
 		LLVMAtomicRMW LLVMResume LLVMLandingPad'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMOpcode class methodsFor:'initialization'!

--- a/LLVMPassManager.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMPassManager.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 

--- a/LLVMPassRegistry.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMPassRegistry.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,6 +6,6 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 

--- a/LLVMRealPredicate.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMRealPredicate.st	Sat Aug 01 06:21:29 2015 +0100
@@ -9,7 +9,7 @@
 		LLVMRealUEQ LLVMRealUGT LLVMRealUGE LLVMRealULT LLVMRealULE
 		LLVMRealUNE LLVMRealPredicateTrue'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMRealPredicate class methodsFor:'initialization'!

--- a/LLVMStXMethod.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMStXMethod.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:'SelectorSpecialCharMappingTable'
 	poolDictionaries:''
-	category:'LLVM-StX'
+	category:'LLVM-S-StX'
 !
 
 !LLVMStXMethod class methodsFor:'initialization'!

--- a/LLVMTargetData.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMTargetData.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 

--- a/LLVMTargetLibraryInfo.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMTargetLibraryInfo.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,6 +6,6 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 

--- a/LLVMThreadLocalMode.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMThreadLocalMode.st	Sat Aug 01 06:21:29 2015 +0100
@@ -8,7 +8,7 @@
 		LLVMLocalDynamicTLSModel LLVMInitialExecTLSModel
 		LLVMLocalExecTLSModel'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMThreadLocalMode class methodsFor:'initialization'!

--- a/LLVMType.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMType.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:''
 	classVariableNames:'Int1 Int16 Int32 Int64 IntPtr'
 	poolDictionaries:'LLVMTypeKind'
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 !LLVMType class methodsFor:'instance creation'!

--- a/LLVMTypeKind.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMTypeKind.st	Sat Aug 01 06:21:29 2015 +0100
@@ -11,7 +11,7 @@
 		LLVMPointerTypeKind LLVMVectorTypeKind LLVMMetadataTypeKind
 		LLVMX86_MMXTypeKind'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 

--- a/LLVMUse.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMUse.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,6 +6,6 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 

--- a/LLVMValue.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMValue.st	Sat Aug 01 06:21:29 2015 +0100
@@ -6,7 +6,7 @@
 	instanceVariableNames:'type'
 	classVariableNames:''
 	poolDictionaries:''
-	category:'LLVM-Core'
+	category:'LLVM-S-Core'
 !
 
 !LLVMValue methodsFor:'accessing'!

--- a/LLVMVerifierFailureAction.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMVerifierFailureAction.st	Sat Aug 01 06:21:29 2015 +0100
@@ -7,7 +7,7 @@
 	classVariableNames:'LLVMAbortProcessAction LLVMPrintMessageAction
 		LLVMReturnStatusAction'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMVerifierFailureAction class methodsFor:'initialization'!

--- a/LLVMVisibility.st	Fri Jul 31 16:21:29 2015 +0100
+++ b/LLVMVisibility.st	Sat Aug 01 06:21:29 2015 +0100
@@ -7,7 +7,7 @@
 	classVariableNames:'LLVMDefaultVisibility LLVMHiddenVisibility
 		LLVMProtectedVisibility'
 	poolDictionaries:''
-	category:'LLVM-Core-Constants'
+	category:'LLVM-S-Core-Constants'
 !
 
 !LLVMVisibility class methodsFor:'initialization'!

--- a/Make.proto	Fri Jul 31 16:21:29 2015 +0100
+++ b/Make.proto	Sat Aug 01 06:21:29 2015 +0100
@@ -17,7 +17,7 @@
 #
 # position (of this package) in directory hierarchy:
 # (must point to ST/X top directory, for tools and includes)
-TOP=../../../stx
+TOP=../../stx
 INCLUDE_TOP=$(TOP)/..
 
 # subdirectories where targets are to be made:

--- a/abbrev.stc	Fri Jul 31 16:21:29 2015 +0100
+++ b/abbrev.stc	Sat Aug 01 06:21:29 2015 +0100
@@ -1,44 +1,44 @@
 # automagically generated by the project definition
 # this file is needed for stc to be able to compile modules independently.
 # it provides information about a classes filename, category and especially namespace.
-LLVM LLVM jv:llvm_s 'LLVM-Internal' 0
-LLVMAtomicOrdering LLVMAtomicOrdering jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMAtomicRMWBinOp LLVMAtomicRMWBinOp jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMAttribute LLVMAttribute jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMByteOrdering LLVMByteOrdering jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMCallConv LLVMCallConv jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMDLLStorageClass LLVMDLLStorageClass jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMDiagnosticSeverity LLVMDiagnosticSeverity jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMExamples LLVMExamples jv:llvm_s 'LLVM-Core-Examples' 0
-LLVMIntPredicate LLVMIntPredicate jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMLandingPadClauseTy LLVMLandingPadClauseTy jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMLinkage LLVMLinkage jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMObject LLVMObject jv:llvm_s 'LLVM-Internal' 0
-LLVMObjectArray LLVMObjectArray jv:llvm_s 'LLVM-Core' 0
-LLVMOpcode LLVMOpcode jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMRealPredicate LLVMRealPredicate jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMThreadLocalMode LLVMThreadLocalMode jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMTypeKind LLVMTypeKind jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMVerifierFailureAction LLVMVerifierFailureAction jv:llvm_s 'LLVM-Core-Constants' 0
-LLVMVisibility LLVMVisibility jv:llvm_s 'LLVM-Core-Constants' 0
-jv_libllvms jv_libllvms jv:llvm_s '* Projects & Packages *' 3
-LLVMBasicBlock LLVMBasicBlock jv:llvm_s 'LLVM-Core' 0
-LLVMContext LLVMContext jv:llvm_s 'LLVM-Core' 0
-LLVMDiagnosticInfo LLVMDiagnosticInfo jv:llvm_s 'LLVM-Core' 0
-LLVMDisposableObject LLVMDisposableObject jv:llvm_s 'LLVM-Internal' 0
-LLVMMCJITCompilerOptions LLVMMCJITCompilerOptions jv:llvm_s 'LLVM-Core' 0
-LLVMPassRegistry LLVMPassRegistry jv:llvm_s 'LLVM-Core' 0
-LLVMTargetLibraryInfo LLVMTargetLibraryInfo jv:llvm_s 'LLVM-Core' 0
-LLVMType LLVMType jv:llvm_s 'LLVM-Core' 0
-LLVMUse LLVMUse jv:llvm_s 'LLVM-Core' 0
-LLVMValue LLVMValue jv:llvm_s 'LLVM-Core' 0
-LLVMBuilder LLVMBuilder jv:llvm_s 'LLVM-Core' 0
-LLVMExecutionEngine LLVMExecutionEngine jv:llvm_s 'LLVM-Core' 0
-LLVMFunction LLVMFunction jv:llvm_s 'LLVM-Core' 0
-LLVMGenericValue LLVMGenericValue jv:llvm_s 'LLVM-Core' 0
-LLVMMCJITMemoryManager LLVMMCJITMemoryManager jv:llvm_s 'LLVM-Core' 0
-LLVMModule LLVMModule jv:llvm_s 'LLVM-Core' 0
-LLVMModuleProvider LLVMModuleProvider jv:llvm_s 'LLVM-Core' 0
-LLVMPassManager LLVMPassManager jv:llvm_s 'LLVM-Core' 0
-LLVMTargetData LLVMTargetData jv:llvm_s 'LLVM-Core' 0
-LLVMStXMethod LLVMStXMethod jv:llvm_s 'LLVM-StX' 0
+LLVM LLVM jv:llvm_s 'LLVM-S-Internal' 0
+LLVMAtomicOrdering LLVMAtomicOrdering jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMAtomicRMWBinOp LLVMAtomicRMWBinOp jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMAttribute LLVMAttribute jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMByteOrdering LLVMByteOrdering jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMCallConv LLVMCallConv jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMDLLStorageClass LLVMDLLStorageClass jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMDiagnosticSeverity LLVMDiagnosticSeverity jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMExamples LLVMExamples jv:llvm_s 'LLVM-S-Core-Examples' 0
+LLVMIntPredicate LLVMIntPredicate jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMLandingPadClauseTy LLVMLandingPadClauseTy jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMLinkage LLVMLinkage jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMObject LLVMObject jv:llvm_s 'LLVM-S-Internal' 0
+LLVMObjectArray LLVMObjectArray jv:llvm_s 'LLVM-S-Core' 0
+LLVMOpcode LLVMOpcode jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMRealPredicate LLVMRealPredicate jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMThreadLocalMode LLVMThreadLocalMode jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMTypeKind LLVMTypeKind jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMVerifierFailureAction LLVMVerifierFailureAction jv:llvm_s 'LLVM-S-Core-Constants' 0
+LLVMVisibility LLVMVisibility jv:llvm_s 'LLVM-S-Core-Constants' 0
+jv_llvm_s jv_llvm_s jv:llvm_s '* Projects & Packages *' 3
+LLVMBasicBlock LLVMBasicBlock jv:llvm_s 'LLVM-S-Core' 0
+LLVMContext LLVMContext jv:llvm_s 'LLVM-S-Core' 0
+LLVMDiagnosticInfo LLVMDiagnosticInfo jv:llvm_s 'LLVM-S-Core' 0
+LLVMDisposableObject LLVMDisposableObject jv:llvm_s 'LLVM-S-Internal' 0
+LLVMMCJITCompilerOptions LLVMMCJITCompilerOptions jv:llvm_s 'LLVM-S-Core' 0
+LLVMPassRegistry LLVMPassRegistry jv:llvm_s 'LLVM-S-Core' 0
+LLVMTargetLibraryInfo LLVMTargetLibraryInfo jv:llvm_s 'LLVM-S-Core' 0
+LLVMType LLVMType jv:llvm_s 'LLVM-S-Core' 0
+LLVMUse LLVMUse jv:llvm_s 'LLVM-S-Core' 0
+LLVMValue LLVMValue jv:llvm_s 'LLVM-S-Core' 0
+LLVMBuilder LLVMBuilder jv:llvm_s 'LLVM-S-Core' 0
+LLVMExecutionEngine LLVMExecutionEngine jv:llvm_s 'LLVM-S-Core' 0
+LLVMFunction LLVMFunction jv:llvm_s 'LLVM-S-Core' 0
+LLVMGenericValue LLVMGenericValue jv:llvm_s 'LLVM-S-Core' 0
+LLVMMCJITMemoryManager LLVMMCJITMemoryManager jv:llvm_s 'LLVM-S-Core' 0
+LLVMModule LLVMModule jv:llvm_s 'LLVM-S-Core' 0
+LLVMModuleProvider LLVMModuleProvider jv:llvm_s 'LLVM-S-Core' 0
+LLVMPassManager LLVMPassManager jv:llvm_s 'LLVM-S-Core' 0
+LLVMTargetData LLVMTargetData jv:llvm_s 'LLVM-S-Core' 0
+LLVMStXMethod LLVMStXMethod jv:llvm_s 'LLVM-S-StX' 0

--- a/bc.mak	Fri Jul 31 16:21:29 2015 +0100
+++ b/bc.mak	Sat Aug 01 06:21:29 2015 +0100
@@ -20,7 +20,7 @@
 #  this has changed; it is now also possible to build using microsoft visual c
 #    (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
 #
-TOP=..\..\..\stx
+TOP=..\..\stx
 INCLUDE_TOP=$(TOP)\..
 
 
@@ -30,8 +30,8 @@
 !INCLUDE Make.spec
 
 LIBNAME=libjv_llvm_s
-MODULE_PATH=libllvms
-RESFILES=libllvms.$(RES)
+MODULE_PATH=llvm_s
+RESFILES=llvm_s.$(RES)