diff --git a/topics/java/lci/xbgf/deyaccifyExpressions3.xbgf b/topics/java/lci/xbgf/deyaccifyExpressions3.xbgf
new file mode 100644
index 00000000..b832a199
--- /dev/null
+++ b/topics/java/lci/xbgf/deyaccifyExpressions3.xbgf
@@ -0,0 +1,687 @@
+
+
+
+
+
+
+ CastExpression
+
+
+
+ CastExpression
+
+
+
+ (
+
+
+
+
+ Expression
+
+
+ Type
+
+
+
+
+ )
+
+
+ UnaryExpression
+
+
+
+
+
+
+
+ CastExpression
+
+
+
+ (
+
+
+ BasicType
+
+
+
+
+ Dims
+
+
+
+
+ )
+
+
+ UnaryExpression
+
+
+
+
+
+
+
+ CastExpression
+
+
+
+ (
+
+
+ TypeDeclSpecifier
+
+
+
+
+ TypeArguments
+
+
+
+
+ BracketsOpt
+
+
+ )
+
+
+ UnaryExpressionNotPlusMinus
+
+
+
+
+
+ CastExpression
+
+
+ PreIncrementExpression
+ PreDecrementExpression
+ UnaryExpressionNotPlusMinus
+
+ UnaryExpression
+
+
+
+ UnaryExpression
+ Expression3
+
+
+
+
+ PostDecrementExpression
+ PostIncrementExpression
+
+ PostfixExpression
+
+
+
+ PostfixExpression
+
+ QualifiedIdentifier
+
+
+
+
+
+ PostfixExpression
+
+
+
+ PostfixExpression
+
+
+ --
+
+
+
+
+
+ PostfixExpression
+ PostfixExpression
+
+
+ PostfixExpression
+
+
+
+ Primary
+
+
+
+
+ Selector
+
+
+
+
+
+
+ ++
+
+
+
+
+
+
+
+
+
+ ++
+
+
+
+
+ ++
+
+
+ --
+
+
+
+
+ PostfixExpression
+
+
+
+
+ Selector
+
+
+
+
+
+ .
+
+
+ Identifier
+
+
+
+
+ Arguments
+
+
+
+
+
+
+
+
+ .
+
+
+ this
+
+
+
+
+
+
+ .
+
+
+ super
+
+
+ SuperSuffix
+
+
+
+
+
+
+ .
+
+
+ new
+
+
+ InnerCreator
+
+
+
+
+
+
+ [
+
+
+ Expression
+
+
+ ]
+
+
+
+
+
+
+
+ PostfixExpression
+
+
+ InnerCreator
+
+
+
+ Identifier
+
+
+ ClassCreatorRest
+
+
+
+
+
+
+
+ ClassCreatorRest
+
+
+
+ Arguments
+
+
+
+
+ ClassBody
+
+
+
+
+
+
+
+
+
+ ConditionalOrExpression
+
+
+ ConditionalOrExpression
+
+
+
+ Expression3
+
+
+
+
+ Expression2Rest
+
+
+
+
+
+
+
+
+
+ ConditionalOrExpression
+ Expression2
+
+
+
+
+ Expression2Rest
+
+
+
+
+
+
+
+ Infixop
+
+
+ Expression3
+
+
+
+
+
+
+
+
+ Expression3
+
+
+ instanceof
+
+
+ Type
+
+
+
+
+
+
+
+
+
+ Infixop
+
+
+
+ ||
+
+
+ &&
+
+
+ |
+
+
+ ^
+
+
+ &
+
+
+ ==
+
+
+ !=
+
+
+ <
+
+
+ >
+
+
+ <=
+
+
+ >=
+
+
+ <<
+
+
+ >>
+
+
+ >>>
+
+
+ +
+
+
+ -
+
+
+ *
+
+
+ /
+
+
+ %
+
+
+
+
+
+ MultiplicativeExpression
+ AdditiveExpression
+ ShiftExpression
+ RelationalExpression
+ EqualityExpression
+ AndExpression
+ ExclusiveOrExpression
+ InclusiveOrExpression
+ ConditionalAndExpression
+
+
+
+ ConditionalExpression
+
+
+
+
+ Expression1Rest
+
+
+
+ ?
+
+
+ Expression
+
+
+ :
+
+
+ ConditionalExpression
+
+
+
+
+
+
+
+ ConditionalExpression
+
+
+
+ Expression2
+
+
+ Expression1Rest
+
+
+
+
+
+
+
+ ConditionalExpression
+
+
+
+ Expression2
+
+
+
+
+ Expression1Rest
+
+
+
+
+
+
+
+
+
+
+ AssignmentExpression
+
+ LeftHandSide
+ Assignment
+
+
+ AssignmentExpression
+
+ Assignment
+
+
+
+ ConditionalExpression
+
+
+ AssignmentExpression
+ Expression1
+
+
+
+ Expression1
+
+
+
+
+
+
+ Expression
+
+
+
+ Expression1
+
+
+
+
+
+
+ AssignmentOperator
+
+
+ Expression1
+
+
+
+
+
+
+
+
+
+
+
+ StatementExpression
+
+
+ StatementExpression
+
+ Expression
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/fixErrors3doc.xbgf b/topics/java/lci/xbgf/fixErrors3doc.xbgf
index 59f7eaf4..34a5b76b 100644
--- a/topics/java/lci/xbgf/fixErrors3doc.xbgf
+++ b/topics/java/lci/xbgf/fixErrors3doc.xbgf
@@ -177,4 +177,13 @@
+
+
+ Expression1
+ Expression
+
+
+ Expression2
+ Expression
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/prepare3.xbgf b/topics/java/lci/xbgf/prepare3.xbgf
index 284e952f..6310fe34 100644
--- a/topics/java/lci/xbgf/prepare3.xbgf
+++ b/topics/java/lci/xbgf/prepare3.xbgf
@@ -11,12 +11,6 @@
Primary
-
- Modifier
-
-
- Statement
-
Selector
diff --git a/topics/java/lci/xbgf/refactorClassDeclarations3.xbgf b/topics/java/lci/xbgf/refactorClassDeclarations3.xbgf
new file mode 100644
index 00000000..a9545b43
--- /dev/null
+++ b/topics/java/lci/xbgf/refactorClassDeclarations3.xbgf
@@ -0,0 +1,617 @@
+
+
+
+
+
+
+
+ ClassOrInterfaceDeclaration
+
+
+
+ ClassDeclaration
+
+
+ InterfaceDeclaration
+
+
+
+
+
+
+
+
+
+ ClassOrInterfaceDeclaration
+
+
+
+ ModifiersOpt
+
+
+
+
+ ClassDeclaration
+
+
+ InterfaceDeclaration
+
+
+
+
+
+
+
+
+
+ ClassBodyDeclarations
+ ClassBodyDeclarations
+
+
+
+
+
+
+ ClassBodyDeclaration
+
+
+
+
+
+
+
+
+ ClassBodyDeclaration
+
+
+
+
+
+
+
+
+ NormalClassDeclaration
+
+
+
+ class
+
+
+ Identifier
+
+
+
+
+ TypeParameters
+
+
+
+
+
+
+ Super
+
+
+
+
+
+
+ Interfaces
+
+
+
+
+ ClassBody
+
+
+
+
+
+ Super
+ Interfaces
+
+
+
+ ClassMemberDeclaration
+ InstanceInitializer
+ StaticInitializer
+ ConstructorDeclaration
+ MethodDeclaration
+ ConstructorDeclarator
+ ResultType
+ MethodHeader
+
+ ClassBodyDeclaration
+
+
+
+
+
+ Block
+
+
+
+
+ static
+
+
+ Block
+
+
+
+
+
+
+
+
+
+
+
+
+
+ static
+
+
+
+
+ Block
+
+
+
+
+
+
+
+
+
+
+
+ static
+
+
+
+
+
+
+ static
+
+
+
+
+
+ ClassBodyDeclaration
+
+
+
+
+
+ ClassBodyDeclaration
+
+ ClassOrInterfaceDeclaration
+
+
+
+
+
+
+ ClassBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ ClassOrInterfaceDeclaration
+
+
+
+
+
+
+
+
+
+
+
+ ClassBodyDeclaration
+
+ FieldDeclaration
+
+
+
+ FieldDeclaration
+
+
+
+
+
+ (
+
+
+
+
+ FormalParameterList
+
+
+
+
+ )
+
+
+
+
+ FormalParameters
+
+
+
+
+
+
+
+ ConstructorDeclaratorRest
+
+
+
+ FormalParameters
+
+
+
+
+ Throws
+
+
+
+
+ ConstructorBody
+
+
+
+
+
+ ConstructorBody
+
+ ConstructorBody
+ MethodBody
+
+
+
+ MethodDeclarator
+
+
+ VoidMethodDeclaratorRestFull
+
+
+
+ void
+
+
+ Identifier
+
+
+ FormalParameters
+
+
+
+
+ Throws
+
+
+
+
+ MethodBody
+
+
+
+
+
+
+
+ VoidMethodDeclaratorRest
+
+
+
+ FormalParameters
+
+
+
+
+ Throws
+
+
+
+
+ MethodBody
+
+
+
+
+
+ VoidMethodDeclaratorRestFull
+
+
+
+
+ MethodDeclaratorRest
+
+
+
+ FormalParameters
+
+
+
+
+ Throws
+
+
+
+
+ MethodBody
+
+
+
+
+
+ ClassBodyDeclaration
+
+
+
+
+
+
+ ModifiersOpt
+
+
+
+
+ TypeParameters
+
+
+
+
+ Type
+
+
+ Identifier
+
+
+ MethodDeclaratorRest
+
+
+
+
+
+
+ ModifiersOpt
+
+
+
+
+ TypeParameters
+
+
+
+
+ Identifier
+
+
+ ConstructorDeclaratorRest
+
+
+
+
+
+
+
+
+ ModifiersOpt
+
+
+
+
+ TypeParameters
+
+
+
+
+
+
+
+
+ Type
+
+
+ Identifier
+
+
+ MethodDeclaratorRest
+
+
+
+
+
+
+ Identifier
+
+
+ ConstructorDeclaratorRest
+
+
+
+
+
+
+
+
+
+
+ ClassBodyDeclaration
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactorTypes.xbgf b/topics/java/lci/xbgf/refactorTypes.xbgf
index cef8b295..5eda5cbe 100644
--- a/topics/java/lci/xbgf/refactorTypes.xbgf
+++ b/topics/java/lci/xbgf/refactorTypes.xbgf
@@ -82,12 +82,6 @@
BasicType
-
-
diff --git a/topics/java/lci/xbgf/refactorTypes3.xbgf b/topics/java/lci/xbgf/refactorTypes3.xbgf
new file mode 100644
index 00000000..55217ff4
--- /dev/null
+++ b/topics/java/lci/xbgf/refactorTypes3.xbgf
@@ -0,0 +1,194 @@
+
+
+
+
+
+ IntegralType
+ FloatingPointType
+ NumericType
+
+ PrimitiveType
+
+
+
+ PrimitiveType
+ BasicType
+
+
+
+
+
+ InterfaceType
+
+
+ Type
+
+
+ InterfaceTypeList
+
+
+
+
+ InterfaceType
+
+
+ Type
+
+
+ ExtendsInterfaces
+
+
+
+
+ ClassType
+
+
+ Type
+
+
+ Super
+
+
+
+ InterfaceType
+ ClassType
+
+
+
+
+ InterfaceTypeList
+ TypeList
+
+
+ TypeList
+
+
+
+ ClassOrInterfaceType
+
+
+
+ ClassType
+
+
+ BracketsOpt
+
+
+
+
+
+
+
+ BracketsOpt
+
+
+
+
+
+ [
+
+
+ ]
+
+
+
+
+
+
+
+
+ ReferenceType
+
+ ArrayType
+
+
+ ReferenceType
+
+ ArrayType
+
+
+
+ TypeVariable
+
+
+ ReferenceType
+
+ Identifier
+
+
+
+
+ ClassOrInterfaceType
+ ClassType
+ ReferenceType
+
\ No newline at end of file