diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer.sample.conf b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer.sample.conf
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer.sample.conf
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer.sample.conf
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CLI.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CLI.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CLI.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CLI.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/AbstractDocElement.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/AbstractDocElement.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/AbstractDocElement.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/AbstractDocElement.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/AbstractParser.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/AbstractParser.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/AbstractParser.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/AbstractParser.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/ClassCommentParser.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/ClassCommentParser.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/ClassCommentParser.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/ClassCommentParser.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/CommentElement.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/CommentElement.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/CommentElement.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/CommentElement.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/DocElement.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/DocElement.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/DocElement.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/DocElement.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/FunctionCommentParser.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/FunctionCommentParser.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/FunctionCommentParser.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/FunctionCommentParser.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/MemberCommentParser.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/MemberCommentParser.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/MemberCommentParser.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/MemberCommentParser.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/PairElement.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/PairElement.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/PairElement.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/PairElement.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/ParameterElement.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/ParameterElement.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/ParameterElement.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/ParameterElement.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/ParserException.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/ParserException.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/ParserException.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/ParserException.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/SingleElement.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/SingleElement.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/CommentParser/SingleElement.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/CommentParser/SingleElement.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/DocGenerators/Generator.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/DocGenerators/Generator.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/DocGenerators/Generator.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/DocGenerators/Generator.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/DocGenerators/HTML.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/DocGenerators/HTML.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/DocGenerators/HTML.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/DocGenerators/HTML.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/DocGenerators/Text.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/DocGenerators/Text.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/DocGenerators/Text.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/DocGenerators/Text.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Exception.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Exception.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Exception.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Exception.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/File.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/File.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/File.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/File.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/MultiFileSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/MultiFileSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/MultiFileSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/MultiFileSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Report.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Report.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Report.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Report.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reporting.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reporting.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reporting.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reporting.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Checkstyle.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Checkstyle.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Checkstyle.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Checkstyle.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Csv.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Csv.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Csv.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Csv.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Emacs.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Emacs.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Emacs.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Emacs.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Full.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Full.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Full.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Full.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Gitblame.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Gitblame.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Gitblame.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Gitblame.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Source.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Source.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Source.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Source.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Summary.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Summary.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Summary.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Summary.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Svnblame.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Svnblame.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Svnblame.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Svnblame.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/VersionControl.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/VersionControl.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/VersionControl.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/VersionControl.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Xml.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Xml.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Reports/Xml.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Reports/Xml.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Sniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Sniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Sniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Sniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/AbstractPatternSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/AbstractPatternSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/AbstractPatternSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/AbstractPatternSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/AbstractScopeSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/AbstractScopeSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/AbstractScopeSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/AbstractScopeSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/AbstractVariableSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/AbstractVariableSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/AbstractVariableSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/AbstractVariableSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/Files/LineLengthStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/Files/LineLengthStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/Files/LineLengthStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/Files/LineLengthStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/Formatting/MultipleStatementAlignmentStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/Formatting/MultipleStatementAlignmentStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/Formatting/MultipleStatementAlignmentStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/Formatting/MultipleStatementAlignmentStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/Functions/OpeningFunctionBraceBsdAllmanStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/Functions/OpeningFunctionBraceBsdAllmanStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/Functions/OpeningFunctionBraceBsdAllmanStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/Functions/OpeningFunctionBraceBsdAllmanStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/Functions/OpeningFunctionBraceKernighanRitchieStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/Functions/OpeningFunctionBraceKernighanRitchieStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/Functions/OpeningFunctionBraceKernighanRitchieStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/Functions/OpeningFunctionBraceKernighanRitchieStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/NamingConventions/UpperCaseConstantNameStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/NamingConventions/UpperCaseConstantNameStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/NamingConventions/UpperCaseConstantNameStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/NamingConventions/UpperCaseConstantNameStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/PHP/DisallowShortOpenTagStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/PHP/DisallowShortOpenTagStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/PHP/DisallowShortOpenTagStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/PHP/DisallowShortOpenTagStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/PHP/LowerCaseConstantStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/PHP/LowerCaseConstantStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/PHP/LowerCaseConstantStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/PHP/LowerCaseConstantStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/PHP/UpperCaseConstantStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/PHP/UpperCaseConstantStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Docs/PHP/UpperCaseConstantStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Docs/PHP/UpperCaseConstantStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Commenting/TodoSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Commenting/TodoSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Commenting/TodoSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Commenting/TodoSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Files/LineEndingsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/LineEndingsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Files/LineLengthSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/LineLengthSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Files/LineLengthSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/LineLengthSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Formatting/NoSpaceAfterCastSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/NoSpaceAfterCastSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Formatting/NoSpaceAfterCastSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/NoSpaceAfterCastSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Functions/CallTimePassByReferenceSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Functions/CallTimePassByReferenceSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Functions/CallTimePassByReferenceSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Functions/CallTimePassByReferenceSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.1.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.1.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.1.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.1.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.2.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.2.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.2.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.2.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Commenting/TodoUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Commenting/TodoUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Commenting/TodoUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Commenting/TodoUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Commenting/TodoUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Commenting/TodoUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Commenting/TodoUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Commenting/TodoUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Commenting/TodoUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Commenting/TodoUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Commenting/TodoUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Commenting/TodoUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Files/LineEndingsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Files/LineLengthUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Files/LineLengthUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Files/LineLengthUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Files/LineLengthUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Files/LineLengthUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Files/LineLengthUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Files/LineLengthUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Files/LineLengthUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/NoSpaceAfterCastUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/NoSpaceAfterCastUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/NoSpaceAfterCastUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/NoSpaceAfterCastUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/NoSpaceAfterCastUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/NoSpaceAfterCastUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/NoSpaceAfterCastUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/NoSpaceAfterCastUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/ruleset.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/ruleset.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Generic/ruleset.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Generic/ruleset.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/IncorrectPatternException.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/IncorrectPatternException.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/IncorrectPatternException.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/IncorrectPatternException.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/CSS/BrowserSpecificStylesSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/CSS/BrowserSpecificStylesSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/CSS/BrowserSpecificStylesSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/CSS/BrowserSpecificStylesSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Channels/ChannelExceptionSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/ChannelExceptionSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Channels/ChannelExceptionSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/ChannelExceptionSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Channels/DisallowSelfActionsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/DisallowSelfActionsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Channels/DisallowSelfActionsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/DisallowSelfActionsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Channels/IncludeSystemSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/IncludeSystemSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Channels/IncludeSystemSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/IncludeSystemSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Channels/UnusedSystemSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/UnusedSystemSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Channels/UnusedSystemSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/UnusedSystemSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Commenting/FunctionCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Commenting/FunctionCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Commenting/FunctionCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Commenting/FunctionCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Debug/DebugCodeSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Debug/DebugCodeSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Debug/DebugCodeSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Debug/DebugCodeSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Debug/FirebugConsoleSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Debug/FirebugConsoleSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Debug/FirebugConsoleSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Debug/FirebugConsoleSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Objects/AssignThisSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Objects/AssignThisSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Objects/AssignThisSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Objects/AssignThisSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Objects/CreateWidgetTypeCallbackSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Objects/CreateWidgetTypeCallbackSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Objects/CreateWidgetTypeCallbackSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Objects/CreateWidgetTypeCallbackSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Objects/DisallowNewWidgetSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Objects/DisallowNewWidgetSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Objects/DisallowNewWidgetSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Objects/DisallowNewWidgetSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/PHP/EvalObjectFactorySniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/PHP/EvalObjectFactorySniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/PHP/EvalObjectFactorySniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/PHP/EvalObjectFactorySniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/PHP/GetRequestDataSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/PHP/GetRequestDataSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/PHP/GetRequestDataSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/PHP/GetRequestDataSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/PHP/ReturnFunctionValueSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/PHP/ReturnFunctionValueSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/PHP/ReturnFunctionValueSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/PHP/ReturnFunctionValueSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Strings/JoinStringsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Strings/JoinStringsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Sniffs/Strings/JoinStringsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Strings/JoinStringsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/CSS/BrowserSpecificStylesUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/CSS/BrowserSpecificStylesUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/CSS/BrowserSpecificStylesUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/CSS/BrowserSpecificStylesUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/CSS/BrowserSpecificStylesUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/CSS/BrowserSpecificStylesUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/CSS/BrowserSpecificStylesUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/CSS/BrowserSpecificStylesUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Channels/DisallowSelfActionsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Channels/DisallowSelfActionsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Channels/DisallowSelfActionsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Channels/DisallowSelfActionsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Channels/DisallowSelfActionsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Channels/DisallowSelfActionsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Channels/DisallowSelfActionsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Channels/DisallowSelfActionsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Channels/IncludeSystemUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Channels/IncludeSystemUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Channels/IncludeSystemUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Channels/IncludeSystemUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Channels/IncludeSystemUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Channels/IncludeSystemUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Channels/IncludeSystemUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Channels/IncludeSystemUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Channels/UnusedSystemUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Channels/UnusedSystemUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Channels/UnusedSystemUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Channels/UnusedSystemUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Channels/UnusedSystemUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Channels/UnusedSystemUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Channels/UnusedSystemUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Channels/UnusedSystemUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Commenting/FunctionCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Commenting/FunctionCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Commenting/FunctionCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Commenting/FunctionCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Commenting/FunctionCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Commenting/FunctionCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Commenting/FunctionCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Commenting/FunctionCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Debug/DebugCodeUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Debug/DebugCodeUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Debug/DebugCodeUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Debug/DebugCodeUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Debug/DebugCodeUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Debug/DebugCodeUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Debug/DebugCodeUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Debug/DebugCodeUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Debug/FirebugConsoleUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Debug/FirebugConsoleUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Debug/FirebugConsoleUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Debug/FirebugConsoleUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Debug/FirebugConsoleUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Debug/FirebugConsoleUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Debug/FirebugConsoleUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Debug/FirebugConsoleUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Objects/AssignThisUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Objects/AssignThisUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Objects/AssignThisUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Objects/AssignThisUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Objects/AssignThisUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Objects/AssignThisUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Objects/AssignThisUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Objects/AssignThisUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Objects/CreateWidgetTypeCallbackUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Objects/CreateWidgetTypeCallbackUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Objects/CreateWidgetTypeCallbackUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Objects/CreateWidgetTypeCallbackUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Objects/CreateWidgetTypeCallbackUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Objects/CreateWidgetTypeCallbackUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Objects/CreateWidgetTypeCallbackUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Objects/CreateWidgetTypeCallbackUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Objects/DisallowNewWidgetUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Objects/DisallowNewWidgetUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Objects/DisallowNewWidgetUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Objects/DisallowNewWidgetUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Objects/DisallowNewWidgetUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Objects/DisallowNewWidgetUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Objects/DisallowNewWidgetUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Objects/DisallowNewWidgetUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/PHP/EvalObjectFactoryUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/PHP/EvalObjectFactoryUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/PHP/EvalObjectFactoryUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/PHP/EvalObjectFactoryUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/PHP/EvalObjectFactoryUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/PHP/EvalObjectFactoryUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/PHP/EvalObjectFactoryUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/PHP/EvalObjectFactoryUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/PHP/GetRequestDataUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/PHP/GetRequestDataUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/PHP/GetRequestDataUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/PHP/GetRequestDataUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/PHP/GetRequestDataUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/PHP/GetRequestDataUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/PHP/GetRequestDataUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/PHP/GetRequestDataUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/PHP/ReturnFunctionValueUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/PHP/ReturnFunctionValueUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/PHP/ReturnFunctionValueUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/PHP/ReturnFunctionValueUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/PHP/ReturnFunctionValueUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/PHP/ReturnFunctionValueUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/PHP/ReturnFunctionValueUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/PHP/ReturnFunctionValueUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Strings/JoinStringsUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Strings/JoinStringsUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Strings/JoinStringsUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Strings/JoinStringsUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Strings/JoinStringsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Strings/JoinStringsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/Tests/Strings/JoinStringsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/Tests/Strings/JoinStringsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/ruleset.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/ruleset.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/MySource/ruleset.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/MySource/ruleset.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Docs/Files/IncludingFileStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Docs/Files/IncludingFileStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Docs/Files/IncludingFileStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Docs/Files/IncludingFileStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Docs/Files/LineLengthStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Docs/Files/LineLengthStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Docs/Files/LineLengthStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Docs/Files/LineLengthStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Docs/Functions/FunctionCallSignatureStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Docs/Functions/FunctionCallSignatureStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Docs/Functions/FunctionCallSignatureStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Docs/Functions/FunctionCallSignatureStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Docs/Functions/ValidDefaultValueStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Docs/Functions/ValidDefaultValueStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Docs/Functions/ValidDefaultValueStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Docs/Functions/ValidDefaultValueStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Docs/NamingConventions/ValidClassNameStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Docs/NamingConventions/ValidClassNameStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Docs/NamingConventions/ValidClassNameStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Docs/NamingConventions/ValidClassNameStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Docs/NamingConventions/ValidFunctionNameStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Docs/NamingConventions/ValidFunctionNameStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Docs/NamingConventions/ValidFunctionNameStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Docs/NamingConventions/ValidFunctionNameStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ScopeIndentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ScopeIndentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ScopeIndentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ScopeIndentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Files/IncludingFileUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Files/IncludingFileUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Files/IncludingFileUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Files/IncludingFileUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/ruleset.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/ruleset.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PEAR/ruleset.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PEAR/ruleset.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PHPCS/ruleset.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PHPCS/ruleset.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/PHPCS/ruleset.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/PHPCS/ruleset.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Docs/Arrays/ArrayDeclarationStandard.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Docs/Arrays/ArrayDeclarationStandard.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Docs/Arrays/ArrayDeclarationStandard.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Docs/Arrays/ArrayDeclarationStandard.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionClosingBraceSpaceSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionClosingBraceSpaceSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionClosingBraceSpaceSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionClosingBraceSpaceSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionOpeningBraceSpaceSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionOpeningBraceSpaceSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionOpeningBraceSpaceSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionOpeningBraceSpaceSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/ColonSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ColonSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/ColonSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ColonSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/ColourDefinitionSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ColourDefinitionSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/ColourDefinitionSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ColourDefinitionSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/DisallowMultipleStyleDefinitionsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/DisallowMultipleStyleDefinitionsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/DisallowMultipleStyleDefinitionsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/DisallowMultipleStyleDefinitionsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/DuplicateClassDefinitionSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/DuplicateClassDefinitionSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/DuplicateClassDefinitionSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/DuplicateClassDefinitionSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/DuplicateStyleDefinitionSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/DuplicateStyleDefinitionSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/DuplicateStyleDefinitionSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/DuplicateStyleDefinitionSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/EmptyClassDefinitionSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/EmptyClassDefinitionSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/EmptyClassDefinitionSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/EmptyClassDefinitionSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/EmptyStyleDefinitionSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/EmptyStyleDefinitionSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/EmptyStyleDefinitionSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/EmptyStyleDefinitionSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/IndentationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/IndentationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/IndentationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/IndentationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/LowercaseStyleDefinitionSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/LowercaseStyleDefinitionSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/LowercaseStyleDefinitionSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/LowercaseStyleDefinitionSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/MissingColonSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/MissingColonSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/MissingColonSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/MissingColonSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/OpacitySniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/OpacitySniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/OpacitySniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/OpacitySniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/SemicolonSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/SemicolonSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CSS/SemicolonSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/SemicolonSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Classes/DuplicatePropertySniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/DuplicatePropertySniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Classes/DuplicatePropertySniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/DuplicatePropertySniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CodeAnalysis/EmptyStatementSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CodeAnalysis/EmptyStatementSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/CodeAnalysis/EmptyStatementSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CodeAnalysis/EmptyStatementSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Debug/JSLintSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Debug/JSLintSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Debug/JSLintSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Debug/JSLintSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Debug/JavaScriptLintSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Debug/JavaScriptLintSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Debug/JavaScriptLintSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Debug/JavaScriptLintSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Formatting/OutputBufferingIndentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Formatting/OutputBufferingIndentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Formatting/OutputBufferingIndentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Formatting/OutputBufferingIndentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ConstantCaseSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ConstantCaseSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ConstantCaseSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ConstantCaseSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Objects/DisallowObjectStringIndexSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Objects/DisallowObjectStringIndexSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Objects/DisallowObjectStringIndexSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Objects/DisallowObjectStringIndexSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Objects/ObjectMemberCommaSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Objects/ObjectMemberCommaSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Objects/ObjectMemberCommaSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Objects/ObjectMemberCommaSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowObEndFlushSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowObEndFlushSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowObEndFlushSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowObEndFlushSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/DiscouragedFunctionsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DiscouragedFunctionsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/DiscouragedFunctionsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DiscouragedFunctionsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/EvalSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/EvalSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/EvalSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/EvalSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/ForbiddenFunctionsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/ForbiddenFunctionsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/ForbiddenFunctionsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/ForbiddenFunctionsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/HeredocSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/PropertyLabelSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/PropertyLabelSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/PropertyLabelSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/PropertyLabelSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeIndentSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeIndentSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeIndentSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeIndentSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionClosingBraceSpaceUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionClosingBraceSpaceUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionClosingBraceSpaceUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionClosingBraceSpaceUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionClosingBraceSpaceUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionClosingBraceSpaceUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionClosingBraceSpaceUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionClosingBraceSpaceUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionOpeningBraceSpaceUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionOpeningBraceSpaceUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionOpeningBraceSpaceUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionOpeningBraceSpaceUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionOpeningBraceSpaceUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionOpeningBraceSpaceUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionOpeningBraceSpaceUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ClassDefinitionOpeningBraceSpaceUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ColonSpacingUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ColonSpacingUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ColonSpacingUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ColonSpacingUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ColonSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ColonSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ColonSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ColonSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ColourDefinitionUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ColourDefinitionUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ColourDefinitionUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ColourDefinitionUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ColourDefinitionUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ColourDefinitionUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/ColourDefinitionUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/ColourDefinitionUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/DisallowMultipleStyleDefinitionsUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/DisallowMultipleStyleDefinitionsUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/DisallowMultipleStyleDefinitionsUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/DisallowMultipleStyleDefinitionsUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/DisallowMultipleStyleDefinitionsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/DisallowMultipleStyleDefinitionsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/DisallowMultipleStyleDefinitionsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/DisallowMultipleStyleDefinitionsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateStyleDefinitionUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateStyleDefinitionUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateStyleDefinitionUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateStyleDefinitionUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateStyleDefinitionUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateStyleDefinitionUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateStyleDefinitionUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/DuplicateStyleDefinitionUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyClassDefinitionUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyClassDefinitionUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyClassDefinitionUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyClassDefinitionUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyClassDefinitionUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyClassDefinitionUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyClassDefinitionUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyClassDefinitionUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyStyleDefinitionUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyStyleDefinitionUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyStyleDefinitionUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyStyleDefinitionUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyStyleDefinitionUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyStyleDefinitionUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyStyleDefinitionUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/EmptyStyleDefinitionUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/IndentationUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/IndentationUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/IndentationUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/IndentationUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/IndentationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/IndentationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/IndentationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/IndentationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/LowercaseStyleDefinitionUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/LowercaseStyleDefinitionUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/LowercaseStyleDefinitionUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/LowercaseStyleDefinitionUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/LowercaseStyleDefinitionUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/LowercaseStyleDefinitionUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/LowercaseStyleDefinitionUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/LowercaseStyleDefinitionUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/MissingColonUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/MissingColonUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/MissingColonUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/MissingColonUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/MissingColonUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/MissingColonUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/MissingColonUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/MissingColonUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/OpacityUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/OpacityUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/OpacityUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/OpacityUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/OpacityUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/OpacityUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/OpacityUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/OpacityUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/SemicolonSpacingUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/SemicolonSpacingUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/SemicolonSpacingUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/SemicolonSpacingUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/SemicolonSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/SemicolonSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CSS/SemicolonSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CSS/SemicolonSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/DuplicatePropertyUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/DuplicatePropertyUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/DuplicatePropertyUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/DuplicatePropertyUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/DuplicatePropertyUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/DuplicatePropertyUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/DuplicatePropertyUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/DuplicatePropertyUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CodeAnalysis/EmptyStatementUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CodeAnalysis/EmptyStatementUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CodeAnalysis/EmptyStatementUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CodeAnalysis/EmptyStatementUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CodeAnalysis/EmptyStatementUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CodeAnalysis/EmptyStatementUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/CodeAnalysis/EmptyStatementUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/CodeAnalysis/EmptyStatementUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Debug/JSLintUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Debug/JSLintUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Debug/JSLintUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Debug/JSLintUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Debug/JSLintUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Debug/JSLintUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Debug/JSLintUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Debug/JSLintUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Debug/JavaScriptLintUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Debug/JavaScriptLintUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Debug/JavaScriptLintUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Debug/JavaScriptLintUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Debug/JavaScriptLintUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Debug/JavaScriptLintUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Debug/JavaScriptLintUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Debug/JavaScriptLintUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Files/FileExtensionUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Files/FileExtensionUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Files/FileExtensionUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Files/FileExtensionUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Formatting/OutputBufferingIndentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Formatting/OutputBufferingIndentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Formatting/OutputBufferingIndentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Formatting/OutputBufferingIndentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Formatting/OutputBufferingIndentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Formatting/OutputBufferingIndentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Formatting/OutputBufferingIndentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Formatting/OutputBufferingIndentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ConstantCaseUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ConstantCaseUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ConstantCaseUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ConstantCaseUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ConstantCaseUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ConstantCaseUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ConstantCaseUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ConstantCaseUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ConstantCaseUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ConstantCaseUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ConstantCaseUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ConstantCaseUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Objects/DisallowObjectStringIndexUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Objects/DisallowObjectStringIndexUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Objects/DisallowObjectStringIndexUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Objects/DisallowObjectStringIndexUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Objects/DisallowObjectStringIndexUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Objects/DisallowObjectStringIndexUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Objects/DisallowObjectStringIndexUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Objects/DisallowObjectStringIndexUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectMemberCommaUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectMemberCommaUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectMemberCommaUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectMemberCommaUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectMemberCommaUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectMemberCommaUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectMemberCommaUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Objects/ObjectMemberCommaUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowObEndFlushUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowObEndFlushUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowObEndFlushUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowObEndFlushUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowObEndFlushUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowObEndFlushUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowObEndFlushUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowObEndFlushUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/EvalUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/EvalUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/EvalUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/EvalUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/EvalUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/EvalUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/EvalUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/EvalUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/ForbiddenFunctionsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/ForbiddenFunctionsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/ForbiddenFunctionsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/ForbiddenFunctionsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/ForbiddenFunctionsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/ForbiddenFunctionsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/ForbiddenFunctionsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/ForbiddenFunctionsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/HeredocUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/HeredocUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/HeredocUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/HeredocUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/HeredocUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/HeredocUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/HeredocUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/HeredocUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/PropertyLabelSpacingUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/PropertyLabelSpacingUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/PropertyLabelSpacingUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/PropertyLabelSpacingUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/PropertyLabelSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/PropertyLabelSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/PropertyLabelSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/PropertyLabelSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeIndentUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeIndentUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeIndentUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeIndentUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeIndentUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeIndentUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeIndentUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeIndentUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.css b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.css
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.css
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.css
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.js b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.js
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.js
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.js
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/ruleset.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/ruleset.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Squiz/ruleset.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Squiz/ruleset.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Sniffs/Debug/CodeAnalyzerSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Sniffs/Debug/CodeAnalyzerSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Sniffs/Debug/CodeAnalyzerSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Sniffs/Debug/CodeAnalyzerSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Sniffs/Files/ClosingTagSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Sniffs/Files/ClosingTagSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Sniffs/Files/ClosingTagSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Sniffs/Files/ClosingTagSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Tests/Files/ClosingTagUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Tests/Files/ClosingTagUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Tests/Files/ClosingTagUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Tests/Files/ClosingTagUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Tests/Files/ClosingTagUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Tests/Files/ClosingTagUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Tests/Files/ClosingTagUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Tests/Files/ClosingTagUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.inc b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.inc
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.inc
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.inc
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/ruleset.xml b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/ruleset.xml
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Standards/Zend/ruleset.xml
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Standards/Zend/ruleset.xml
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Tokenizers/CSS.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Tokenizers/CSS.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Tokenizers/CSS.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Tokenizers/CSS.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Tokenizers/JS.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Tokenizers/JS.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Tokenizers/JS.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Tokenizers/JS.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Tokenizers/PHP.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Tokenizers/PHP.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Tokenizers/PHP.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Tokenizers/PHP.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Tokens.php b/main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Tokens.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/CodeSniffer/Tokens.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/CodeSniffer/Tokens.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/scripts/phpcs b/main/inc/lib/phpdocx/lib/php_codesniffer/scripts/phpcs
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/scripts/phpcs
rename to main/inc/lib/phpdocx/lib/php_codesniffer/scripts/phpcs
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/scripts/phpcs-svn-pre-commit b/main/inc/lib/phpdocx/lib/php_codesniffer/scripts/phpcs-svn-pre-commit
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/scripts/phpcs-svn-pre-commit
rename to main/inc/lib/phpdocx/lib/php_codesniffer/scripts/phpcs-svn-pre-commit
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/scripts/phpcs.bat b/main/inc/lib/phpdocx/lib/php_codesniffer/scripts/phpcs.bat
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/scripts/phpcs.bat
rename to main/inc/lib/phpdocx/lib/php_codesniffer/scripts/phpcs.bat
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/AllTests.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/AllTests.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/AllTests.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/AllTests.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/AllTests.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/AllTests.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/AllTests.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/AllTests.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/ErrorSuppressionTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/ErrorSuppressionTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/ErrorSuppressionTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/ErrorSuppressionTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/File/GetMethodParametersTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/File/GetMethodParametersTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/File/GetMethodParametersTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/File/GetMethodParametersTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/IsCamelCapsTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/IsCamelCapsTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/IsCamelCapsTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/IsCamelCapsTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/ReportingTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/ReportingTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/ReportingTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/ReportingTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/AbstractTestCase.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/AbstractTestCase.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/AbstractTestCase.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/AbstractTestCase.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/CheckstyleTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/CheckstyleTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/CheckstyleTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/CheckstyleTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/CsvTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/CsvTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/CsvTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/CsvTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/EmacsTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/EmacsTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/EmacsTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/EmacsTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/FullTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/FullTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/FullTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/FullTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/GitblameTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/GitblameTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/GitblameTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/GitblameTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/Mock/Gitblame.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/Mock/Gitblame.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/Mock/Gitblame.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/Mock/Gitblame.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/Mock/Svnblame.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/Mock/Svnblame.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/Mock/Svnblame.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/Mock/Svnblame.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/SourceTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/SourceTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/SourceTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/SourceTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/SummaryTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/SummaryTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/SummaryTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/SummaryTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/SvnblameTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/SvnblameTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/SvnblameTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/SvnblameTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/XSD/Checkstyle.xsd b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/XSD/Checkstyle.xsd
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/XSD/Checkstyle.xsd
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/XSD/Checkstyle.xsd
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/XSD/Xml.xsd b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/XSD/Xml.xsd
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/XSD/Xml.xsd
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/XSD/Xml.xsd
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/XmlTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/XmlTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Core/Reports/XmlTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Core/Reports/XmlTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Standards/AbstractSniffUnitTest.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Standards/AbstractSniffUnitTest.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Standards/AbstractSniffUnitTest.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Standards/AbstractSniffUnitTest.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Standards/AllSniffs.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/Standards/AllSniffs.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/Standards/AllSniffs.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/Standards/AllSniffs.php
diff --git a/main/inc/lib/phpdocx/lib/php_codesniffer2/tests/TestSuite.php b/main/inc/lib/phpdocx/lib/php_codesniffer/tests/TestSuite.php
similarity index 100%
rename from main/inc/lib/phpdocx/lib/php_codesniffer2/tests/TestSuite.php
rename to main/inc/lib/phpdocx/lib/php_codesniffer/tests/TestSuite.php