diff --git a/code_sniffer/Sniffs/Commenting/FileCommentSniff.php b/code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php
similarity index 100%
rename from code_sniffer/Sniffs/Commenting/FileCommentSniff.php
rename to code_sniffer/phpbb/Sniffs/Commenting/FileCommentSniff.php
diff --git a/code_sniffer/Tests/Commenting/FileCommentUnitTest.inc b/code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.inc
similarity index 100%
rename from code_sniffer/Tests/Commenting/FileCommentUnitTest.inc
rename to code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.inc
diff --git a/code_sniffer/Tests/Commenting/FileCommentUnitTest.php b/code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.php
similarity index 100%
rename from code_sniffer/Tests/Commenting/FileCommentUnitTest.php
rename to code_sniffer/phpbb/Tests/Commenting/FileCommentUnitTest.php
diff --git a/code_sniffer/build.xml b/code_sniffer/phpbb/build.xml
similarity index 100%
rename from code_sniffer/build.xml
rename to code_sniffer/phpbb/build.xml
diff --git a/code_sniffer/phpbbCodingStandard.php b/code_sniffer/phpbb/phpbbCodingStandard.php
similarity index 100%
rename from code_sniffer/phpbbCodingStandard.php
rename to code_sniffer/phpbb/phpbbCodingStandard.php