From 24d030cc69b2794255bf6124a6389543f4d20a5d Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Sat, 7 Sep 2019 15:56:06 +0200
Subject: [PATCH] [scala] Move AST nodes to n.s.p.lang.scala.ast

* Also make ScalaTreeBuilder and AbstractScalaNode
  package private
---
 .../pmd/lang/scala/ScalaParser.java           |   3 +-
 .../scala/{ast => }/ScalaTreeBuilder.java     | 276 +++++++++---------
 .../lang/scala/ast/{nodes => }/ASTCase.java   |   4 +-
 .../scala/ast/{nodes => }/ASTCtorPrimary.java |   4 +-
 .../ast/{nodes => }/ASTCtorSecondary.java     |   4 +-
 .../scala/ast/{nodes => }/ASTDeclDef.java     |   4 +-
 .../scala/ast/{nodes => }/ASTDeclType.java    |   4 +-
 .../scala/ast/{nodes => }/ASTDeclVal.java     |   4 +-
 .../scala/ast/{nodes => }/ASTDeclVar.java     |   4 +-
 .../scala/ast/{nodes => }/ASTDefnClass.java   |   4 +-
 .../scala/ast/{nodes => }/ASTDefnDef.java     |   4 +-
 .../scala/ast/{nodes => }/ASTDefnMacro.java   |   4 +-
 .../scala/ast/{nodes => }/ASTDefnObject.java  |   4 +-
 .../scala/ast/{nodes => }/ASTDefnTrait.java   |   4 +-
 .../scala/ast/{nodes => }/ASTDefnType.java    |   4 +-
 .../scala/ast/{nodes => }/ASTDefnVal.java     |   4 +-
 .../scala/ast/{nodes => }/ASTDefnVar.java     |   4 +-
 .../{nodes => }/ASTEnumeratorGenerator.java   |   4 +-
 .../ast/{nodes => }/ASTEnumeratorGuard.java   |   4 +-
 .../ast/{nodes => }/ASTEnumeratorVal.java     |   4 +-
 .../lang/scala/ast/{nodes => }/ASTImport.java |   4 +-
 .../ast/{nodes => }/ASTImporteeName.java      |   4 +-
 .../ast/{nodes => }/ASTImporteeRename.java    |   4 +-
 .../ast/{nodes => }/ASTImporteeUnimport.java  |   4 +-
 .../ast/{nodes => }/ASTImporteeWildcard.java  |   4 +-
 .../scala/ast/{nodes => }/ASTImporter.java    |   4 +-
 .../lang/scala/ast/{nodes => }/ASTInit.java   |   4 +-
 .../scala/ast/{nodes => }/ASTLitBoolean.java  |   4 +-
 .../scala/ast/{nodes => }/ASTLitByte.java     |   4 +-
 .../scala/ast/{nodes => }/ASTLitChar.java     |   4 +-
 .../scala/ast/{nodes => }/ASTLitDouble.java   |   4 +-
 .../scala/ast/{nodes => }/ASTLitFloat.java    |   4 +-
 .../lang/scala/ast/{nodes => }/ASTLitInt.java |   4 +-
 .../scala/ast/{nodes => }/ASTLitLong.java     |   4 +-
 .../scala/ast/{nodes => }/ASTLitNull.java     |   4 +-
 .../scala/ast/{nodes => }/ASTLitShort.java    |   4 +-
 .../scala/ast/{nodes => }/ASTLitString.java   |   4 +-
 .../scala/ast/{nodes => }/ASTLitSymbol.java   |   4 +-
 .../scala/ast/{nodes => }/ASTLitUnit.java     |   4 +-
 .../scala/ast/{nodes => }/ASTModAbstract.java |   4 +-
 .../scala/ast/{nodes => }/ASTModAnnot.java    |   4 +-
 .../scala/ast/{nodes => }/ASTModCase.java     |   4 +-
 .../ast/{nodes => }/ASTModContravariant.java  |   4 +-
 .../ast/{nodes => }/ASTModCovariant.java      |   4 +-
 .../scala/ast/{nodes => }/ASTModFinal.java    |   4 +-
 .../scala/ast/{nodes => }/ASTModImplicit.java |   4 +-
 .../scala/ast/{nodes => }/ASTModInline.java   |   4 +-
 .../scala/ast/{nodes => }/ASTModLazy.java     |   4 +-
 .../scala/ast/{nodes => }/ASTModOverride.java |   4 +-
 .../scala/ast/{nodes => }/ASTModPrivate.java  |   4 +-
 .../ast/{nodes => }/ASTModProtected.java      |   4 +-
 .../scala/ast/{nodes => }/ASTModSealed.java   |   4 +-
 .../scala/ast/{nodes => }/ASTModValParam.java |   4 +-
 .../scala/ast/{nodes => }/ASTModVarParam.java |   4 +-
 .../ast/{nodes => }/ASTNameAnonymous.java     |   4 +-
 .../ast/{nodes => }/ASTNameIndeterminate.java |   4 +-
 .../ast/{nodes => }/ASTPatAlternative.java    |   4 +-
 .../scala/ast/{nodes => }/ASTPatBind.java     |   4 +-
 .../scala/ast/{nodes => }/ASTPatExtract.java  |   4 +-
 .../ast/{nodes => }/ASTPatExtractInfix.java   |   4 +-
 .../ast/{nodes => }/ASTPatInterpolate.java    |   4 +-
 .../ast/{nodes => }/ASTPatSeqWildcard.java    |   4 +-
 .../scala/ast/{nodes => }/ASTPatTuple.java    |   4 +-
 .../scala/ast/{nodes => }/ASTPatTyped.java    |   4 +-
 .../lang/scala/ast/{nodes => }/ASTPatVar.java |   4 +-
 .../scala/ast/{nodes => }/ASTPatWildcard.java |   4 +-
 .../lang/scala/ast/{nodes => }/ASTPatXml.java |   4 +-
 .../lang/scala/ast/{nodes => }/ASTPkg.java    |   4 +-
 .../scala/ast/{nodes => }/ASTPkgObject.java   |   4 +-
 .../lang/scala/ast/{nodes => }/ASTQuasi.java  |   4 +-
 .../lang/scala/ast/{nodes => }/ASTSelf.java   |   4 +-
 .../lang/scala/ast/{nodes => }/ASTSource.java |   3 +-
 .../scala/ast/{nodes => }/ASTTemplate.java    |   4 +-
 .../ast/{nodes => }/ASTTermAnnotate.java      |   4 +-
 .../scala/ast/{nodes => }/ASTTermApply.java   |   4 +-
 .../ast/{nodes => }/ASTTermApplyInfix.java    |   4 +-
 .../ast/{nodes => }/ASTTermApplyType.java     |   4 +-
 .../ast/{nodes => }/ASTTermApplyUnary.java    |   4 +-
 .../scala/ast/{nodes => }/ASTTermAscribe.java |   4 +-
 .../scala/ast/{nodes => }/ASTTermAssign.java  |   4 +-
 .../scala/ast/{nodes => }/ASTTermBlock.java   |   4 +-
 .../lang/scala/ast/{nodes => }/ASTTermDo.java |   4 +-
 .../scala/ast/{nodes => }/ASTTermEta.java     |   4 +-
 .../scala/ast/{nodes => }/ASTTermFor.java     |   4 +-
 .../ast/{nodes => }/ASTTermForYield.java      |   4 +-
 .../ast/{nodes => }/ASTTermFunction.java      |   4 +-
 .../lang/scala/ast/{nodes => }/ASTTermIf.java |   4 +-
 .../ast/{nodes => }/ASTTermInterpolate.java   |   4 +-
 .../scala/ast/{nodes => }/ASTTermMatch.java   |   4 +-
 .../scala/ast/{nodes => }/ASTTermName.java    |   4 +-
 .../scala/ast/{nodes => }/ASTTermNew.java     |   4 +-
 .../ast/{nodes => }/ASTTermNewAnonymous.java  |   4 +-
 .../scala/ast/{nodes => }/ASTTermParam.java   |   4 +-
 .../{nodes => }/ASTTermPartialFunction.java   |   4 +-
 .../ast/{nodes => }/ASTTermPlaceholder.java   |   4 +-
 .../ast/{nodes => }/ASTTermRepeated.java      |   4 +-
 .../scala/ast/{nodes => }/ASTTermReturn.java  |   4 +-
 .../scala/ast/{nodes => }/ASTTermSelect.java  |   4 +-
 .../scala/ast/{nodes => }/ASTTermSuper.java   |   4 +-
 .../scala/ast/{nodes => }/ASTTermThis.java    |   4 +-
 .../scala/ast/{nodes => }/ASTTermThrow.java   |   4 +-
 .../scala/ast/{nodes => }/ASTTermTry.java     |   4 +-
 .../{nodes => }/ASTTermTryWithHandler.java    |   4 +-
 .../scala/ast/{nodes => }/ASTTermTuple.java   |   4 +-
 .../scala/ast/{nodes => }/ASTTermWhile.java   |   4 +-
 .../scala/ast/{nodes => }/ASTTermXml.java     |   4 +-
 .../scala/ast/{nodes => }/ASTTypeAnd.java     |   4 +-
 .../ast/{nodes => }/ASTTypeAnnotate.java      |   4 +-
 .../scala/ast/{nodes => }/ASTTypeApply.java   |   4 +-
 .../ast/{nodes => }/ASTTypeApplyInfix.java    |   4 +-
 .../scala/ast/{nodes => }/ASTTypeBounds.java  |   4 +-
 .../scala/ast/{nodes => }/ASTTypeByName.java  |   4 +-
 .../ast/{nodes => }/ASTTypeExistential.java   |   4 +-
 .../ast/{nodes => }/ASTTypeFunction.java      |   4 +-
 .../{nodes => }/ASTTypeImplicitFunction.java  |   4 +-
 .../scala/ast/{nodes => }/ASTTypeLambda.java  |   4 +-
 .../scala/ast/{nodes => }/ASTTypeMethod.java  |   4 +-
 .../scala/ast/{nodes => }/ASTTypeName.java    |   4 +-
 .../lang/scala/ast/{nodes => }/ASTTypeOr.java |   4 +-
 .../scala/ast/{nodes => }/ASTTypeParam.java   |   4 +-
 .../ast/{nodes => }/ASTTypePlaceholder.java   |   4 +-
 .../scala/ast/{nodes => }/ASTTypeProject.java |   4 +-
 .../scala/ast/{nodes => }/ASTTypeRefine.java  |   4 +-
 .../ast/{nodes => }/ASTTypeRepeated.java      |   4 +-
 .../scala/ast/{nodes => }/ASTTypeSelect.java  |   4 +-
 .../ast/{nodes => }/ASTTypeSingleton.java     |   4 +-
 .../scala/ast/{nodes => }/ASTTypeTuple.java   |   4 +-
 .../scala/ast/{nodes => }/ASTTypeVar.java     |   4 +-
 .../scala/ast/{nodes => }/ASTTypeWith.java    |   4 +-
 .../ast/{nodes => }/AbstractScalaNode.java    |   8 +-
 .../lang/scala/ast/ScalaParserVisitor.java    | 128 --------
 .../scala/ast/ScalaParserVisitorAdapter.java  | 128 --------
 .../pmd/lang/scala/rule/ScalaRule.java        | 254 ++++++++--------
 .../scala/rule/ScalaRuleChainVisitor.java     |   2 +-
 .../pmd/scala/rule/ScalaRuleTest.java         |   4 +-
 135 files changed, 399 insertions(+), 911 deletions(-)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/{ast => }/ScalaTreeBuilder.java (55%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTCase.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTCtorPrimary.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTCtorSecondary.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTDeclDef.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTDeclType.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTDeclVal.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTDeclVar.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTDefnClass.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTDefnDef.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTDefnMacro.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTDefnObject.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTDefnTrait.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTDefnType.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTDefnVal.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTDefnVar.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTEnumeratorGenerator.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTEnumeratorGuard.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTEnumeratorVal.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTImport.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTImporteeName.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTImporteeRename.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTImporteeUnimport.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTImporteeWildcard.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTImporter.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTInit.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTLitBoolean.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTLitByte.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTLitChar.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTLitDouble.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTLitFloat.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTLitInt.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTLitLong.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTLitNull.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTLitShort.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTLitString.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTLitSymbol.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTLitUnit.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModAbstract.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModAnnot.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModCase.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModContravariant.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModCovariant.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModFinal.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModImplicit.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModInline.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModLazy.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModOverride.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModPrivate.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModProtected.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModSealed.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModValParam.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTModVarParam.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTNameAnonymous.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTNameIndeterminate.java (86%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPatAlternative.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPatBind.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPatExtract.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPatExtractInfix.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPatInterpolate.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPatSeqWildcard.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPatTuple.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPatTyped.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPatVar.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPatWildcard.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPatXml.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPkg.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTPkgObject.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTQuasi.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTSelf.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTSource.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTemplate.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermAnnotate.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermApply.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermApplyInfix.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermApplyType.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermApplyUnary.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermAscribe.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermAssign.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermBlock.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermDo.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermEta.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermFor.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermForYield.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermFunction.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermIf.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermInterpolate.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermMatch.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermName.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermNew.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermNewAnonymous.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermParam.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermPartialFunction.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermPlaceholder.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermRepeated.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermReturn.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermSelect.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermSuper.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermThis.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermThrow.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermTry.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermTryWithHandler.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermTuple.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermWhile.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTermXml.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeAnd.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeAnnotate.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeApply.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeApplyInfix.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeBounds.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeByName.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeExistential.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeFunction.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeImplicitFunction.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeLambda.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeMethod.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeName.java (85%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeOr.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeParam.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypePlaceholder.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeProject.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeRefine.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeRepeated.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeSelect.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeSingleton.java (84%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeTuple.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeVar.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/ASTTypeWith.java (83%)
 rename pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/{nodes => }/AbstractScalaNode.java (81%)

diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java
index cf8e668c61..124d5c6787 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaParser.java
@@ -16,8 +16,7 @@ import net.sourceforge.pmd.lang.ParserOptions;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.ParseException;
-import net.sourceforge.pmd.lang.scala.ast.ScalaTreeBuilder;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTSource;
+import net.sourceforge.pmd.lang.scala.ast.ASTSource;
 
 import scala.meta.Dialect;
 import scala.meta.Source;
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaTreeBuilder.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaTreeBuilder.java
similarity index 55%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaTreeBuilder.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaTreeBuilder.java
index 7b79001166..f2227cf105 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaTreeBuilder.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ScalaTreeBuilder.java
@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast;
+package net.sourceforge.pmd.lang.scala;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -11,134 +11,134 @@ import java.util.Map;
 import java.util.Stack;
 
 import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTCase;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTCtorPrimary;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTCtorSecondary;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclDef;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclType;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclVal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnClass;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnDef;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnMacro;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnObject;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnTrait;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnType;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnVal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTEnumeratorGenerator;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTEnumeratorGuard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTEnumeratorVal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImport;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeRename;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeUnimport;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeWildcard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporter;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTInit;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitBoolean;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitByte;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitChar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitDouble;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitFloat;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitInt;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitLong;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitNull;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitShort;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitString;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitSymbol;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitUnit;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModAbstract;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModAnnot;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModCase;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModContravariant;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModCovariant;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModFinal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModImplicit;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModInline;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModLazy;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModOverride;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModPrivate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModProtected;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModSealed;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModValParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModVarParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTNameAnonymous;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTNameIndeterminate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatAlternative;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatBind;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatExtract;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatExtractInfix;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatInterpolate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatSeqWildcard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatTuple;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatTyped;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatWildcard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatXml;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPkg;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPkgObject;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTQuasi;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTSelf;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTSource;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTemplate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermAnnotate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApply;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApplyInfix;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApplyType;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApplyUnary;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermAscribe;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermAssign;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermBlock;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermDo;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermEta;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermFor;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermForYield;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermIf;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermInterpolate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermMatch;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermNew;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermNewAnonymous;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermPartialFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermPlaceholder;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermRepeated;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermReturn;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermSelect;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermSuper;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermThis;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermThrow;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermTry;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermTryWithHandler;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermTuple;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermWhile;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermXml;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeAnd;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeAnnotate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeApply;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeApplyInfix;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeBounds;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeByName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeExistential;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeImplicitFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeLambda;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeMethod;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeOr;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypePlaceholder;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeProject;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeRefine;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeRepeated;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeSelect;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeSingleton;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeTuple;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeWith;
-import net.sourceforge.pmd.lang.scala.ast.nodes.AbstractScalaNode;
+import net.sourceforge.pmd.lang.scala.ast.ASTCase;
+import net.sourceforge.pmd.lang.scala.ast.ASTCtorPrimary;
+import net.sourceforge.pmd.lang.scala.ast.ASTCtorSecondary;
+import net.sourceforge.pmd.lang.scala.ast.ASTDeclDef;
+import net.sourceforge.pmd.lang.scala.ast.ASTDeclType;
+import net.sourceforge.pmd.lang.scala.ast.ASTDeclVal;
+import net.sourceforge.pmd.lang.scala.ast.ASTDeclVar;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnClass;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnDef;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnMacro;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnObject;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnTrait;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnType;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnVal;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnVar;
+import net.sourceforge.pmd.lang.scala.ast.ASTEnumeratorGenerator;
+import net.sourceforge.pmd.lang.scala.ast.ASTEnumeratorGuard;
+import net.sourceforge.pmd.lang.scala.ast.ASTEnumeratorVal;
+import net.sourceforge.pmd.lang.scala.ast.ASTImport;
+import net.sourceforge.pmd.lang.scala.ast.ASTImporteeName;
+import net.sourceforge.pmd.lang.scala.ast.ASTImporteeRename;
+import net.sourceforge.pmd.lang.scala.ast.ASTImporteeUnimport;
+import net.sourceforge.pmd.lang.scala.ast.ASTImporteeWildcard;
+import net.sourceforge.pmd.lang.scala.ast.ASTImporter;
+import net.sourceforge.pmd.lang.scala.ast.ASTInit;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitBoolean;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitByte;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitChar;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitDouble;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitFloat;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitInt;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitLong;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitNull;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitShort;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitString;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitSymbol;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitUnit;
+import net.sourceforge.pmd.lang.scala.ast.ASTModAbstract;
+import net.sourceforge.pmd.lang.scala.ast.ASTModAnnot;
+import net.sourceforge.pmd.lang.scala.ast.ASTModCase;
+import net.sourceforge.pmd.lang.scala.ast.ASTModContravariant;
+import net.sourceforge.pmd.lang.scala.ast.ASTModCovariant;
+import net.sourceforge.pmd.lang.scala.ast.ASTModFinal;
+import net.sourceforge.pmd.lang.scala.ast.ASTModImplicit;
+import net.sourceforge.pmd.lang.scala.ast.ASTModInline;
+import net.sourceforge.pmd.lang.scala.ast.ASTModLazy;
+import net.sourceforge.pmd.lang.scala.ast.ASTModOverride;
+import net.sourceforge.pmd.lang.scala.ast.ASTModPrivate;
+import net.sourceforge.pmd.lang.scala.ast.ASTModProtected;
+import net.sourceforge.pmd.lang.scala.ast.ASTModSealed;
+import net.sourceforge.pmd.lang.scala.ast.ASTModValParam;
+import net.sourceforge.pmd.lang.scala.ast.ASTModVarParam;
+import net.sourceforge.pmd.lang.scala.ast.ASTNameAnonymous;
+import net.sourceforge.pmd.lang.scala.ast.ASTNameIndeterminate;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatAlternative;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatBind;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatExtract;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatExtractInfix;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatInterpolate;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatSeqWildcard;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatTuple;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatTyped;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatVar;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatWildcard;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatXml;
+import net.sourceforge.pmd.lang.scala.ast.ASTPkg;
+import net.sourceforge.pmd.lang.scala.ast.ASTPkgObject;
+import net.sourceforge.pmd.lang.scala.ast.ASTQuasi;
+import net.sourceforge.pmd.lang.scala.ast.ASTSelf;
+import net.sourceforge.pmd.lang.scala.ast.ASTSource;
+import net.sourceforge.pmd.lang.scala.ast.ASTTemplate;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermAnnotate;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermApply;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermApplyInfix;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermApplyType;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermApplyUnary;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermAscribe;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermAssign;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermBlock;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermDo;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermEta;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermFor;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermForYield;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermFunction;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermIf;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermInterpolate;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermMatch;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermName;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermNew;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermNewAnonymous;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermParam;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermPartialFunction;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermPlaceholder;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermRepeated;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermReturn;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermSelect;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermSuper;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermThis;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermThrow;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermTry;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermTryWithHandler;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermTuple;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermWhile;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermXml;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeAnd;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeAnnotate;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeApply;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeApplyInfix;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeBounds;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeByName;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeExistential;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeFunction;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeImplicitFunction;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeLambda;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeMethod;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeName;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeOr;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeParam;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypePlaceholder;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeProject;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeRefine;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeRepeated;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeSelect;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeSingleton;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeTuple;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeVar;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeWith;
+import net.sourceforge.pmd.lang.scala.ast.ScalaNode;
 
 import scala.meta.Case;
 import scala.meta.Ctor;
@@ -166,9 +166,9 @@ import scala.meta.Type;
  * Translates Scala's AST to a PMD-compatible AST.
  *
  */
-public class ScalaTreeBuilder {
+class ScalaTreeBuilder {
 
-    private static final Map<Class<? extends Tree>, Constructor<? extends AbstractScalaNode<?>>> NODE_TYPE_TO_NODE_ADAPTER_TYPE = new HashMap<>();
+    private static final Map<Class<? extends Tree>, Constructor<? extends ScalaNode<?>>> NODE_TYPE_TO_NODE_ADAPTER_TYPE = new HashMap<>();
 
     static {
         register(Case.class, ASTCase.class);
@@ -307,7 +307,7 @@ public class ScalaTreeBuilder {
     private Stack<Tree> parents = new Stack<>();
 
     private static <T extends Tree> void register(Class<T> nodeType,
-            Class<? extends AbstractScalaNode<T>> nodeAdapterType) {
+            Class<? extends ScalaNode<T>> nodeAdapterType) {
         try {
             NODE_TYPE_TO_NODE_ADAPTER_TYPE.put(nodeType, nodeAdapterType.getConstructor(nodeType));
         } catch (SecurityException | NoSuchMethodException e) {
@@ -316,10 +316,10 @@ public class ScalaTreeBuilder {
     }
 
     @SuppressWarnings("unchecked")
-    static <T extends Tree> AbstractScalaNode<T> createNodeAdapter(T node) {
+    static <T extends Tree> ScalaNode<T> createNodeAdapter(T node) {
         try {
 
-            Constructor<? extends AbstractScalaNode<T>> constructor = null;
+            Constructor<? extends ScalaNode<T>> constructor = null;
 
             // This isInstance is unfortunately necessary as Scala gives us
             // access to the Interface (Trait) of classes at compile time, but
@@ -328,7 +328,7 @@ public class ScalaTreeBuilder {
             // translation between Scala Traits and Java Classes
             for (Class<?> treeClass : NODE_TYPE_TO_NODE_ADAPTER_TYPE.keySet()) {
                 if (treeClass.isInstance(node)) {
-                    constructor = (Constructor<? extends AbstractScalaNode<T>>) NODE_TYPE_TO_NODE_ADAPTER_TYPE
+                    constructor = (Constructor<? extends ScalaNode<T>>) NODE_TYPE_TO_NODE_ADAPTER_TYPE
                             .get(treeClass);
                 }
             }
@@ -355,13 +355,13 @@ public class ScalaTreeBuilder {
      *            the Java node that extends the PMD Node interface
      * @return a PMD compatible node representing the Scala AST node
      */
-    public <T extends Tree> AbstractScalaNode<T> build(T astNode) {
+    public <T extends Tree> ScalaNode<T> build(T astNode) {
         return buildInternal(astNode);
     }
 
-    private <T extends Tree> AbstractScalaNode<T> buildInternal(T astNode) {
+    private <T extends Tree> ScalaNode<T> buildInternal(T astNode) {
         // Create a Node
-        AbstractScalaNode<T> node = createNodeAdapter(astNode);
+        ScalaNode<T> node = createNodeAdapter(astNode);
 
         // Append to parent
         Node parent = nodes.isEmpty() ? null : nodes.peek();
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTCase.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCase.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTCase.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCase.java
index ace7bd3f68..67f15f425f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTCase.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCase.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Case;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTCtorPrimary.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorPrimary.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTCtorPrimary.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorPrimary.java
index b14fc9f28a..0af1023fad 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTCtorPrimary.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorPrimary.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Ctor;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTCtorSecondary.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorSecondary.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTCtorSecondary.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorSecondary.java
index 05ea6d4426..73311d27a5 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTCtorSecondary.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTCtorSecondary.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Ctor;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDeclDef.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclDef.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDeclDef.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclDef.java
index 600359c0ad..775ce99d7d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDeclDef.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclDef.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Decl;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDeclType.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclType.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDeclType.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclType.java
index a14b0e2321..313c9b58eb 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDeclType.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclType.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Decl;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDeclVal.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVal.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDeclVal.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVal.java
index c70353de3f..a9bea4625a 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDeclVal.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVal.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Decl;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDeclVar.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVar.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDeclVar.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVar.java
index 9c8d9ffb26..db62f63c27 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDeclVar.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDeclVar.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Decl;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnClass.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnClass.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnClass.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnClass.java
index 9b7752c7a2..2561e63a63 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnClass.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnClass.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Defn;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnDef.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnDef.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnDef.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnDef.java
index 2d5e48675b..3754071933 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnDef.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnDef.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Defn;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnMacro.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnMacro.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnMacro.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnMacro.java
index a37d7d533d..337ade5484 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnMacro.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnMacro.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Defn;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnObject.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnObject.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnObject.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnObject.java
index 6c879fa0e4..785d469c28 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnObject.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnObject.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Defn;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnTrait.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnTrait.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnTrait.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnTrait.java
index a0af7e9fa2..414eb5f8b5 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnTrait.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnTrait.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Defn;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnType.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnType.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnType.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnType.java
index a2a27217c7..9295937570 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnType.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnType.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Defn;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnVal.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVal.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnVal.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVal.java
index 1293e82380..45c28a701a 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnVal.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVal.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Defn;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnVar.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVar.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnVar.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVar.java
index d68f664c25..c2b2dba5d6 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTDefnVar.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTDefnVar.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Defn;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTEnumeratorGenerator.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGenerator.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTEnumeratorGenerator.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGenerator.java
index 12a48434fc..a1ef09fb86 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTEnumeratorGenerator.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGenerator.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Enumerator;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTEnumeratorGuard.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGuard.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTEnumeratorGuard.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGuard.java
index 7da0c86b82..9b9654d117 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTEnumeratorGuard.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorGuard.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Enumerator;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTEnumeratorVal.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorVal.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTEnumeratorVal.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorVal.java
index 2806f43d1c..1c1a030781 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTEnumeratorVal.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTEnumeratorVal.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Enumerator;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImport.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImport.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImport.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImport.java
index e09621cc43..701ab7c780 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImport.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImport.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Import;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporteeName.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeName.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporteeName.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeName.java
index 8bb3213b12..87e618fc06 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporteeName.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeName.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Importee;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporteeRename.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeRename.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporteeRename.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeRename.java
index c37981338f..41e0220229 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporteeRename.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeRename.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Importee;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporteeUnimport.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeUnimport.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporteeUnimport.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeUnimport.java
index a661a3cd68..ad2cc7c2c0 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporteeUnimport.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeUnimport.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Importee;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporteeWildcard.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeWildcard.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporteeWildcard.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeWildcard.java
index 3a871e3b0e..32e4c44a1d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporteeWildcard.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporteeWildcard.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Importee;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporter.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporter.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporter.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporter.java
index b9eef065ed..423a605808 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTImporter.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTImporter.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Importer;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTInit.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTInit.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTInit.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTInit.java
index efb382e4e2..1e16ca2b87 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTInit.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTInit.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Init;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitBoolean.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitBoolean.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitBoolean.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitBoolean.java
index 516dc21c15..484450cfa4 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitBoolean.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitBoolean.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Lit;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitByte.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitByte.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitByte.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitByte.java
index 0d5982a3fc..570947fed8 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitByte.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitByte.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Lit;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitChar.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitChar.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitChar.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitChar.java
index 9377d1e47e..777c9eaf00 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitChar.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitChar.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Lit;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitDouble.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitDouble.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitDouble.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitDouble.java
index e182381622..ed32fe77c9 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitDouble.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitDouble.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Lit;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitFloat.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitFloat.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitFloat.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitFloat.java
index 615d566aa8..cbf27f526e 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitFloat.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitFloat.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Lit;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitInt.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitInt.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitInt.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitInt.java
index 40c254aa5c..a08fcbfb9b 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitInt.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitInt.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Lit;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitLong.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitLong.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitLong.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitLong.java
index f0e864eccd..9b7d265630 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitLong.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitLong.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Lit;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitNull.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitNull.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitNull.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitNull.java
index 59707b8fbd..d44f0ba1f0 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitNull.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitNull.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Lit;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitShort.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitShort.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitShort.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitShort.java
index da5ac3e418..ae0252086a 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitShort.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitShort.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Lit;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitString.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitString.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitString.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitString.java
index 4129659aea..d041998ce2 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitString.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitString.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Lit;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitSymbol.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitSymbol.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitSymbol.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitSymbol.java
index f4eac49e90..58f26bef21 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitSymbol.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitSymbol.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Lit;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitUnit.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitUnit.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitUnit.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitUnit.java
index 27d2479024..ea34e64159 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTLitUnit.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTLitUnit.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Lit;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModAbstract.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAbstract.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModAbstract.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAbstract.java
index 6a0edf0083..83f52f5511 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModAbstract.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAbstract.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModAnnot.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAnnot.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModAnnot.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAnnot.java
index fc8c23cc03..ed1b3c012a 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModAnnot.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModAnnot.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModCase.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCase.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModCase.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCase.java
index 84c6ffb55f..f9765efda4 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModCase.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCase.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModContravariant.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModContravariant.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModContravariant.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModContravariant.java
index bf4aee046e..9b2b7385e8 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModContravariant.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModContravariant.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModCovariant.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCovariant.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModCovariant.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCovariant.java
index 7d348bbe79..ccb4ca4ec2 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModCovariant.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModCovariant.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModFinal.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModFinal.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModFinal.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModFinal.java
index 175655f2f0..f6ae21ddeb 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModFinal.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModFinal.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModImplicit.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModImplicit.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModImplicit.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModImplicit.java
index c53653071a..0b4120dc5d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModImplicit.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModImplicit.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModInline.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModInline.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModInline.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModInline.java
index a3a80685cc..d0763e0b64 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModInline.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModInline.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModLazy.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModLazy.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModLazy.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModLazy.java
index 5dd3d48b0b..8394ab1c06 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModLazy.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModLazy.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModOverride.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModOverride.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModOverride.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModOverride.java
index d119cc05b6..b7de1d9ac4 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModOverride.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModOverride.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModPrivate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModPrivate.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModPrivate.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModPrivate.java
index 2e2f2d7dec..9856073928 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModPrivate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModPrivate.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModProtected.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModProtected.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModProtected.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModProtected.java
index 90aa8b508c..42aeca12ed 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModProtected.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModProtected.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModSealed.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModSealed.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModSealed.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModSealed.java
index b1dfbaa123..cf2bc95721 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModSealed.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModSealed.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModValParam.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModValParam.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModValParam.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModValParam.java
index 78b3001ff7..553a005000 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModValParam.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModValParam.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModVarParam.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModVarParam.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModVarParam.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModVarParam.java
index e25152e1d1..7362acc0ad 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTModVarParam.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTModVarParam.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Mod;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTNameAnonymous.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameAnonymous.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTNameAnonymous.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameAnonymous.java
index 09cdc40c84..3b06634f52 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTNameAnonymous.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameAnonymous.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Name;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTNameIndeterminate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameIndeterminate.java
similarity index 86%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTNameIndeterminate.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameIndeterminate.java
index 8188aa6e50..27a8f04856 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTNameIndeterminate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTNameIndeterminate.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Name;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatAlternative.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatAlternative.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatAlternative.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatAlternative.java
index 2ce27fc256..d7289319d3 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatAlternative.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatAlternative.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pat;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatBind.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatBind.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatBind.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatBind.java
index 49b4a63312..b463b534c3 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatBind.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatBind.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pat;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatExtract.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtract.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatExtract.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtract.java
index 058243b239..8e1e534f7d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatExtract.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtract.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pat;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatExtractInfix.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtractInfix.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatExtractInfix.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtractInfix.java
index 3edd5a4961..1903a03068 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatExtractInfix.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatExtractInfix.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pat;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatInterpolate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatInterpolate.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatInterpolate.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatInterpolate.java
index 2e2a30d421..4f6b058013 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatInterpolate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatInterpolate.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pat;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatSeqWildcard.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatSeqWildcard.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatSeqWildcard.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatSeqWildcard.java
index dc6d10277a..535b4e0f30 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatSeqWildcard.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatSeqWildcard.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pat;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatTuple.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTuple.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatTuple.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTuple.java
index 43191bf601..4423c8dd85 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatTuple.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTuple.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pat;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatTyped.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTyped.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatTyped.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTyped.java
index 6526e2fc91..f23baad56c 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatTyped.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatTyped.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pat;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatVar.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatVar.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatVar.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatVar.java
index a8f494801f..932e3a8313 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatVar.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatVar.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pat;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatWildcard.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatWildcard.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatWildcard.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatWildcard.java
index ceaa2994b8..300034edd3 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatWildcard.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatWildcard.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pat;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatXml.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatXml.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatXml.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatXml.java
index 995df32fdd..887fb16d4f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPatXml.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatXml.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pat;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPkg.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkg.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPkg.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkg.java
index 6b88e7bc21..11076e6e0f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPkg.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkg.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pkg;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPkgObject.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkgObject.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPkgObject.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkgObject.java
index 7f58bba838..983a404087 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTPkgObject.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPkgObject.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Pkg;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTQuasi.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTQuasi.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTQuasi.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTQuasi.java
index effd444a5c..4675c85d5d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTQuasi.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTQuasi.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Tree.Quasi;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTSelf.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSelf.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTSelf.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSelf.java
index 3ef2ff295a..69100b5569 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTSelf.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSelf.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Self;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTSource.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSource.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTSource.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSource.java
index 75710edfee..01ea4e03f6 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTSource.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTSource.java
@@ -2,10 +2,9 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import net.sourceforge.pmd.lang.ast.RootNode;
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
 
 import scala.meta.Source;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTemplate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTemplate.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTemplate.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTemplate.java
index 44de97663a..ad149d0557 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTemplate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTemplate.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Template;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermAnnotate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAnnotate.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermAnnotate.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAnnotate.java
index 9af1c638c0..5306f6c63c 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermAnnotate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAnnotate.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermApply.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApply.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermApply.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApply.java
index 8010dc62e5..03451dbe52 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermApply.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApply.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermApplyInfix.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyInfix.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermApplyInfix.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyInfix.java
index e863b2d0ef..e77b3d789f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermApplyInfix.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyInfix.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermApplyType.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyType.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermApplyType.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyType.java
index cd90fcf62d..8920de89d7 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermApplyType.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyType.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermApplyUnary.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyUnary.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermApplyUnary.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyUnary.java
index ec9417e1db..f61f2a979c 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermApplyUnary.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermApplyUnary.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermAscribe.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAscribe.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermAscribe.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAscribe.java
index 0bbfaf7feb..4f690d267d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermAscribe.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAscribe.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermAssign.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAssign.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermAssign.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAssign.java
index 5a62b3c365..e2827ea726 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermAssign.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermAssign.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermBlock.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermBlock.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermBlock.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermBlock.java
index d5dbeaa705..6a52c84ee6 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermBlock.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermBlock.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermDo.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermDo.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermDo.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermDo.java
index b007891219..9792af31b0 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermDo.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermDo.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermEta.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermEta.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermEta.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermEta.java
index 1f32188695..f0116b635f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermEta.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermEta.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermFor.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFor.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermFor.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFor.java
index 0e138ef577..186d7b0995 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermFor.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFor.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermForYield.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermForYield.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermForYield.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermForYield.java
index 649487a52e..d649703c66 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermForYield.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermForYield.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermFunction.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFunction.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermFunction.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFunction.java
index 0f21a46ee4..e1a04e46a9 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermFunction.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermFunction.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermIf.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermIf.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermIf.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermIf.java
index e1cc0da91b..4d07ff20da 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermIf.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermIf.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermInterpolate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermInterpolate.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermInterpolate.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermInterpolate.java
index 7e5971a9e4..c75c23a31a 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermInterpolate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermInterpolate.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermMatch.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermMatch.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermMatch.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermMatch.java
index fe59cfdf55..9a49013ed5 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermMatch.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermMatch.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermName.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermName.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermName.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermName.java
index 6c59730893..ba03bfd402 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermName.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermName.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermNew.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNew.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermNew.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNew.java
index ebd166354b..0c23b446d4 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermNew.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNew.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermNewAnonymous.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNewAnonymous.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermNewAnonymous.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNewAnonymous.java
index 30e0fe2ee9..3e827a6ee2 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermNewAnonymous.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermNewAnonymous.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermParam.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParam.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermParam.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParam.java
index 051dc64d9f..1838c44b9e 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermParam.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParam.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermPartialFunction.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPartialFunction.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermPartialFunction.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPartialFunction.java
index bf7e6ec09d..29c2e9daf5 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermPartialFunction.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPartialFunction.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermPlaceholder.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPlaceholder.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermPlaceholder.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPlaceholder.java
index 17587c8c3b..118b7c2786 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermPlaceholder.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermPlaceholder.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermRepeated.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermRepeated.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermRepeated.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermRepeated.java
index 0209b73df0..5965d23dc0 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermRepeated.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermRepeated.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermReturn.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermReturn.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermReturn.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermReturn.java
index e5f360d6e4..2cf863a9b6 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermReturn.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermReturn.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermSelect.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSelect.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermSelect.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSelect.java
index a9152c41b2..e849f8b5bf 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermSelect.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSelect.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermSuper.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSuper.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermSuper.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSuper.java
index aebbb777ac..80b17ec2e2 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermSuper.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermSuper.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermThis.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThis.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermThis.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThis.java
index 94b51b0b45..4dc8d87975 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermThis.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThis.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermThrow.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThrow.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermThrow.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThrow.java
index 94f8f6893a..1ba6cf069c 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermThrow.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermThrow.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermTry.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTry.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermTry.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTry.java
index 6a36b81f58..9fef6bbd10 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermTry.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTry.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermTryWithHandler.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTryWithHandler.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermTryWithHandler.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTryWithHandler.java
index b0496ce0f0..dd7ffae60b 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermTryWithHandler.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTryWithHandler.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermTuple.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTuple.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermTuple.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTuple.java
index 699ab667de..c136e560b2 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermTuple.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermTuple.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermWhile.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermWhile.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermWhile.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermWhile.java
index 3d81e6bb2a..5bdba261e2 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermWhile.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermWhile.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermXml.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermXml.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermXml.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermXml.java
index b9b68bd6c1..be0f2371c1 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTermXml.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermXml.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Term;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeAnd.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnd.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeAnd.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnd.java
index e903b7c98d..71c0a59c5d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeAnd.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnd.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeAnnotate.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnnotate.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeAnnotate.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnnotate.java
index 8aa0707893..86dca697a1 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeAnnotate.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeAnnotate.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeApply.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApply.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeApply.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApply.java
index 6d96c2ca4e..bca97018b3 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeApply.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApply.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeApplyInfix.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApplyInfix.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeApplyInfix.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApplyInfix.java
index 84f53c3f44..6c9e750fbe 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeApplyInfix.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeApplyInfix.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeBounds.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeBounds.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeBounds.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeBounds.java
index 1b79b3baa2..bfcec2c026 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeBounds.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeBounds.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeByName.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeByName.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeByName.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeByName.java
index d559876434..b362f3a4e0 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeByName.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeByName.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeExistential.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeExistential.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeExistential.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeExistential.java
index 8b9251de45..d94c5bc8b6 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeExistential.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeExistential.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeFunction.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFunction.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeFunction.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFunction.java
index 472ea4aedb..37205196c5 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeFunction.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFunction.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeImplicitFunction.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeImplicitFunction.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeImplicitFunction.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeImplicitFunction.java
index c21c0bb466..ce9230b611 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeImplicitFunction.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeImplicitFunction.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeLambda.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeLambda.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeLambda.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeLambda.java
index 5e58100773..211f69ba91 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeLambda.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeLambda.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeMethod.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeMethod.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeMethod.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeMethod.java
index bbe586791e..db2f5fc7a2 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeMethod.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeMethod.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeName.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeName.java
similarity index 85%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeName.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeName.java
index fc3e2cfd9b..076af0208d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeName.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeName.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeOr.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeOr.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeOr.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeOr.java
index 26fd59f72b..486195c655 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeOr.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeOr.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeParam.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParam.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeParam.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParam.java
index 35d7219d91..5d78edfc20 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeParam.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParam.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypePlaceholder.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypePlaceholder.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypePlaceholder.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypePlaceholder.java
index 668a9fa16e..d9cd3a4f09 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypePlaceholder.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypePlaceholder.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeProject.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeProject.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeProject.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeProject.java
index 49251570a4..4899e56a09 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeProject.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeProject.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeRefine.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRefine.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeRefine.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRefine.java
index 80c5d3bd95..4de38db5f6 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeRefine.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRefine.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeRepeated.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRepeated.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeRepeated.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRepeated.java
index decd454c4a..193a057a3d 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeRepeated.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeRepeated.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeSelect.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSelect.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeSelect.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSelect.java
index c126630b23..d44376b136 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeSelect.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSelect.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeSingleton.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSingleton.java
similarity index 84%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeSingleton.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSingleton.java
index 4b1625a812..47de8b0993 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeSingleton.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeSingleton.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeTuple.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeTuple.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeTuple.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeTuple.java
index bd6d4c5e64..62bb61d0eb 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeTuple.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeTuple.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeVar.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeVar.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeVar.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeVar.java
index a397eb4387..8965f5a51f 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeVar.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeVar.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeWith.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeWith.java
similarity index 83%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeWith.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeWith.java
index f03832c342..69cb87cd15 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/ASTTypeWith.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeWith.java
@@ -2,9 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
-
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import scala.meta.Type;
 
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/AbstractScalaNode.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
similarity index 81%
rename from pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/AbstractScalaNode.java
rename to pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
index 92c4f1e4ea..7ae518c6eb 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/nodes/AbstractScalaNode.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
@@ -2,11 +2,9 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.scala.ast.nodes;
+package net.sourceforge.pmd.lang.scala.ast;
 
 import net.sourceforge.pmd.lang.ast.AbstractNode;
-import net.sourceforge.pmd.lang.scala.ast.ScalaNode;
-import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
 
 import scala.meta.Tree;
 import scala.meta.inputs.Position;
@@ -18,7 +16,7 @@ import scala.meta.inputs.Position;
  * @param <T>
  *            the type of the Scala tree node
  */
-public abstract class AbstractScalaNode<T extends Tree> extends AbstractNode implements ScalaNode<T> {
+abstract class AbstractScalaNode<T extends Tree> extends AbstractNode implements ScalaNode<T> {
     private final T node;
 
     /**
@@ -27,7 +25,7 @@ public abstract class AbstractScalaNode<T extends Tree> extends AbstractNode imp
      * @param treeNode
      *            the scala tree node this node wraps
      */
-    public AbstractScalaNode(T treeNode) {
+    AbstractScalaNode(T treeNode) {
         super(0);
         node = treeNode;
         Position pos = node.pos();
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitor.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitor.java
index 4bd7475d00..1aaf3a2cba 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitor.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitor.java
@@ -4,134 +4,6 @@
 
 package net.sourceforge.pmd.lang.scala.ast;
 
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTCase;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTCtorPrimary;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTCtorSecondary;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclDef;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclType;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclVal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnClass;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnDef;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnMacro;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnObject;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnTrait;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnType;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnVal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTEnumeratorGenerator;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTEnumeratorGuard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTEnumeratorVal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImport;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeRename;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeUnimport;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeWildcard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporter;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTInit;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitBoolean;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitByte;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitChar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitDouble;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitFloat;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitInt;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitLong;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitNull;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitShort;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitString;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitSymbol;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitUnit;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModAbstract;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModAnnot;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModCase;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModContravariant;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModCovariant;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModFinal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModImplicit;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModInline;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModLazy;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModOverride;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModPrivate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModProtected;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModSealed;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModValParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModVarParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTNameAnonymous;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTNameIndeterminate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatAlternative;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatBind;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatExtract;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatExtractInfix;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatInterpolate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatSeqWildcard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatTuple;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatTyped;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatWildcard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatXml;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPkg;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPkgObject;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTQuasi;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTSelf;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTSource;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTemplate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermAnnotate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApply;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApplyInfix;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApplyType;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApplyUnary;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermAscribe;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermAssign;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermBlock;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermDo;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermEta;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermFor;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermForYield;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermIf;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermInterpolate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermMatch;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermNew;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermNewAnonymous;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermPartialFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermPlaceholder;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermRepeated;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermReturn;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermSelect;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermSuper;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermThis;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermThrow;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermTry;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermTryWithHandler;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermTuple;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermWhile;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermXml;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeAnd;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeAnnotate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeApply;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeApplyInfix;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeBounds;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeByName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeExistential;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeImplicitFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeLambda;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeMethod;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeOr;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypePlaceholder;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeProject;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeRefine;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeRepeated;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeSelect;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeSingleton;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeTuple;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeWith;
-
 /**
  * A Visitor Pattern Interface for the Scala AST.
  *
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitorAdapter.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitorAdapter.java
index 0e1fad8278..0829cb6822 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitorAdapter.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaParserVisitorAdapter.java
@@ -4,134 +4,6 @@
 
 package net.sourceforge.pmd.lang.scala.ast;
 
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTCase;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTCtorPrimary;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTCtorSecondary;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclDef;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclType;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclVal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnClass;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnDef;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnMacro;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnObject;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnTrait;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnType;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnVal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTEnumeratorGenerator;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTEnumeratorGuard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTEnumeratorVal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImport;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeRename;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeUnimport;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeWildcard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporter;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTInit;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitBoolean;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitByte;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitChar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitDouble;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitFloat;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitInt;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitLong;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitNull;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitShort;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitString;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitSymbol;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitUnit;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModAbstract;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModAnnot;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModCase;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModContravariant;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModCovariant;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModFinal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModImplicit;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModInline;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModLazy;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModOverride;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModPrivate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModProtected;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModSealed;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModValParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModVarParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTNameAnonymous;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTNameIndeterminate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatAlternative;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatBind;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatExtract;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatExtractInfix;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatInterpolate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatSeqWildcard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatTuple;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatTyped;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatWildcard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatXml;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPkg;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPkgObject;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTQuasi;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTSelf;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTSource;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTemplate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermAnnotate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApply;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApplyInfix;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApplyType;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApplyUnary;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermAscribe;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermAssign;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermBlock;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermDo;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermEta;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermFor;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermForYield;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermIf;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermInterpolate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermMatch;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermNew;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermNewAnonymous;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermPartialFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermPlaceholder;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermRepeated;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermReturn;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermSelect;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermSuper;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermThis;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermThrow;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermTry;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermTryWithHandler;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermTuple;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermWhile;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermXml;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeAnd;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeAnnotate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeApply;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeApplyInfix;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeBounds;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeByName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeExistential;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeImplicitFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeLambda;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeMethod;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeOr;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypePlaceholder;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeProject;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeRefine;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeRepeated;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeSelect;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeSingleton;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeTuple;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeWith;
-
 import scala.meta.Case;
 import scala.meta.Ctor;
 import scala.meta.Decl;
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRule.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRule.java
index 90927df68e..1d98627e3b 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRule.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRule.java
@@ -11,135 +11,135 @@ import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.rule.AbstractRule;
 import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
+import net.sourceforge.pmd.lang.scala.ast.ASTCase;
+import net.sourceforge.pmd.lang.scala.ast.ASTCtorPrimary;
+import net.sourceforge.pmd.lang.scala.ast.ASTCtorSecondary;
+import net.sourceforge.pmd.lang.scala.ast.ASTDeclDef;
+import net.sourceforge.pmd.lang.scala.ast.ASTDeclType;
+import net.sourceforge.pmd.lang.scala.ast.ASTDeclVal;
+import net.sourceforge.pmd.lang.scala.ast.ASTDeclVar;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnClass;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnDef;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnMacro;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnObject;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnTrait;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnType;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnVal;
+import net.sourceforge.pmd.lang.scala.ast.ASTDefnVar;
+import net.sourceforge.pmd.lang.scala.ast.ASTEnumeratorGenerator;
+import net.sourceforge.pmd.lang.scala.ast.ASTEnumeratorGuard;
+import net.sourceforge.pmd.lang.scala.ast.ASTEnumeratorVal;
+import net.sourceforge.pmd.lang.scala.ast.ASTImport;
+import net.sourceforge.pmd.lang.scala.ast.ASTImporteeName;
+import net.sourceforge.pmd.lang.scala.ast.ASTImporteeRename;
+import net.sourceforge.pmd.lang.scala.ast.ASTImporteeUnimport;
+import net.sourceforge.pmd.lang.scala.ast.ASTImporteeWildcard;
+import net.sourceforge.pmd.lang.scala.ast.ASTImporter;
+import net.sourceforge.pmd.lang.scala.ast.ASTInit;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitBoolean;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitByte;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitChar;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitDouble;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitFloat;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitInt;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitLong;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitNull;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitShort;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitString;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitSymbol;
+import net.sourceforge.pmd.lang.scala.ast.ASTLitUnit;
+import net.sourceforge.pmd.lang.scala.ast.ASTModAbstract;
+import net.sourceforge.pmd.lang.scala.ast.ASTModAnnot;
+import net.sourceforge.pmd.lang.scala.ast.ASTModCase;
+import net.sourceforge.pmd.lang.scala.ast.ASTModContravariant;
+import net.sourceforge.pmd.lang.scala.ast.ASTModCovariant;
+import net.sourceforge.pmd.lang.scala.ast.ASTModFinal;
+import net.sourceforge.pmd.lang.scala.ast.ASTModImplicit;
+import net.sourceforge.pmd.lang.scala.ast.ASTModInline;
+import net.sourceforge.pmd.lang.scala.ast.ASTModLazy;
+import net.sourceforge.pmd.lang.scala.ast.ASTModOverride;
+import net.sourceforge.pmd.lang.scala.ast.ASTModPrivate;
+import net.sourceforge.pmd.lang.scala.ast.ASTModProtected;
+import net.sourceforge.pmd.lang.scala.ast.ASTModSealed;
+import net.sourceforge.pmd.lang.scala.ast.ASTModValParam;
+import net.sourceforge.pmd.lang.scala.ast.ASTModVarParam;
+import net.sourceforge.pmd.lang.scala.ast.ASTNameAnonymous;
+import net.sourceforge.pmd.lang.scala.ast.ASTNameIndeterminate;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatAlternative;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatBind;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatExtract;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatExtractInfix;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatInterpolate;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatSeqWildcard;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatTuple;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatTyped;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatVar;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatWildcard;
+import net.sourceforge.pmd.lang.scala.ast.ASTPatXml;
+import net.sourceforge.pmd.lang.scala.ast.ASTPkg;
+import net.sourceforge.pmd.lang.scala.ast.ASTPkgObject;
+import net.sourceforge.pmd.lang.scala.ast.ASTQuasi;
+import net.sourceforge.pmd.lang.scala.ast.ASTSelf;
+import net.sourceforge.pmd.lang.scala.ast.ASTSource;
+import net.sourceforge.pmd.lang.scala.ast.ASTTemplate;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermAnnotate;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermApply;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermApplyInfix;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermApplyType;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermApplyUnary;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermAscribe;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermAssign;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermBlock;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermDo;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermEta;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermFor;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermForYield;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermFunction;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermIf;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermInterpolate;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermMatch;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermName;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermNew;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermNewAnonymous;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermParam;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermPartialFunction;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermPlaceholder;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermRepeated;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermReturn;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermSelect;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermSuper;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermThis;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermThrow;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermTry;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermTryWithHandler;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermTuple;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermWhile;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermXml;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeAnd;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeAnnotate;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeApply;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeApplyInfix;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeBounds;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeByName;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeExistential;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeFunction;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeImplicitFunction;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeLambda;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeMethod;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeName;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeOr;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeParam;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypePlaceholder;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeProject;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeRefine;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeRepeated;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeSelect;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeSingleton;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeTuple;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeVar;
+import net.sourceforge.pmd.lang.scala.ast.ASTTypeWith;
 import net.sourceforge.pmd.lang.scala.ast.ScalaNode;
 import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTCase;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTCtorPrimary;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTCtorSecondary;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclDef;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclType;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclVal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDeclVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnClass;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnDef;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnMacro;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnObject;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnTrait;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnType;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnVal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTDefnVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTEnumeratorGenerator;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTEnumeratorGuard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTEnumeratorVal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImport;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeRename;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeUnimport;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporteeWildcard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTImporter;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTInit;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitBoolean;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitByte;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitChar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitDouble;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitFloat;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitInt;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitLong;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitNull;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitShort;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitString;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitSymbol;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTLitUnit;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModAbstract;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModAnnot;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModCase;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModContravariant;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModCovariant;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModFinal;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModImplicit;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModInline;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModLazy;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModOverride;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModPrivate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModProtected;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModSealed;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModValParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTModVarParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTNameAnonymous;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTNameIndeterminate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatAlternative;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatBind;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatExtract;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatExtractInfix;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatInterpolate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatSeqWildcard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatTuple;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatTyped;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatWildcard;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPatXml;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPkg;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTPkgObject;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTQuasi;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTSelf;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTSource;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTemplate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermAnnotate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApply;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApplyInfix;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApplyType;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApplyUnary;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermAscribe;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermAssign;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermBlock;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermDo;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermEta;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermFor;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermForYield;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermIf;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermInterpolate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermMatch;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermNew;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermNewAnonymous;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermPartialFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermPlaceholder;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermRepeated;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermReturn;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermSelect;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermSuper;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermThis;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermThrow;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermTry;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermTryWithHandler;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermTuple;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermWhile;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermXml;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeAnd;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeAnnotate;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeApply;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeApplyInfix;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeBounds;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeByName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeExistential;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeImplicitFunction;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeLambda;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeMethod;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeName;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeOr;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeParam;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypePlaceholder;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeProject;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeRefine;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeRepeated;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeSelect;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeSingleton;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeTuple;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeVar;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTypeWith;
 
 import scala.meta.Case;
 import scala.meta.Ctor;
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleChainVisitor.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleChainVisitor.java
index e950394720..02191b7077 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleChainVisitor.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleChainVisitor.java
@@ -11,10 +11,10 @@ import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.rule.AbstractRuleChainVisitor;
 import net.sourceforge.pmd.lang.rule.XPathRule;
+import net.sourceforge.pmd.lang.scala.ast.ASTSource;
 import net.sourceforge.pmd.lang.scala.ast.ScalaNode;
 import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitor;
 import net.sourceforge.pmd.lang.scala.ast.ScalaParserVisitorAdapter;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTSource;
 
 /**
  * A Rule Chain visitor for Scala.
diff --git a/pmd-scala/src/test/java/net/sourceforge/pmd/scala/rule/ScalaRuleTest.java b/pmd-scala/src/test/java/net/sourceforge/pmd/scala/rule/ScalaRuleTest.java
index ae1d801291..82c6b260a7 100644
--- a/pmd-scala/src/test/java/net/sourceforge/pmd/scala/rule/ScalaRuleTest.java
+++ b/pmd-scala/src/test/java/net/sourceforge/pmd/scala/rule/ScalaRuleTest.java
@@ -26,9 +26,9 @@ import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.lang.LanguageVersionHandler;
 import net.sourceforge.pmd.lang.Parser;
 import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermApply;
+import net.sourceforge.pmd.lang.scala.ast.ASTTermName;
 import net.sourceforge.pmd.lang.scala.ast.ScalaNode;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermApply;
-import net.sourceforge.pmd.lang.scala.ast.nodes.ASTTermName;
 import net.sourceforge.pmd.lang.scala.rule.ScalaRule;
 
 public class ScalaRuleTest {