diff --git a/pmd-gherkin/src/main/java/net/sourceforge/pmd/cpd/GherkinLanguage.java b/pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/GherkinLanguage.java
similarity index 79%
rename from pmd-gherkin/src/main/java/net/sourceforge/pmd/cpd/GherkinLanguage.java
rename to pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/GherkinLanguage.java
index 1dd68d4e39..d95282944b 100644
--- a/pmd-gherkin/src/main/java/net/sourceforge/pmd/cpd/GherkinLanguage.java
+++ b/pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/GherkinLanguage.java
@@ -2,7 +2,9 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd;
+package net.sourceforge.pmd.lang.gherkin.cpd;
+
+import net.sourceforge.pmd.cpd.AbstractLanguage;
 
 /**
  * Language implementation for Gherkin.
diff --git a/pmd-gherkin/src/main/java/net/sourceforge/pmd/cpd/GherkinTokenizer.java b/pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/GherkinTokenizer.java
similarity index 85%
rename from pmd-gherkin/src/main/java/net/sourceforge/pmd/cpd/GherkinTokenizer.java
rename to pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/GherkinTokenizer.java
index 64978c5e7e..a883344b1f 100644
--- a/pmd-gherkin/src/main/java/net/sourceforge/pmd/cpd/GherkinTokenizer.java
+++ b/pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/GherkinTokenizer.java
@@ -2,10 +2,12 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd;
+package net.sourceforge.pmd.lang.gherkin.cpd;
 
 import org.antlr.v4.runtime.CharStream;
 
+import net.sourceforge.pmd.cpd.AntlrTokenizer;
+import net.sourceforge.pmd.cpd.SourceCode;
 import net.sourceforge.pmd.cpd.token.AntlrTokenFilter;
 import net.sourceforge.pmd.lang.antlr.AntlrTokenManager;
 import net.sourceforge.pmd.lang.gherkin.ast.GherkinLexer;
diff --git a/pmd-gherkin/src/main/java/net/sourceforge/pmd/cpd/package-info.java b/pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/package-info.java
similarity index 76%
rename from pmd-gherkin/src/main/java/net/sourceforge/pmd/cpd/package-info.java
rename to pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/package-info.java
index 53ab0add38..9a25b68105 100644
--- a/pmd-gherkin/src/main/java/net/sourceforge/pmd/cpd/package-info.java
+++ b/pmd-gherkin/src/main/java/net/sourceforge/pmd/lang/gherkin/cpd/package-info.java
@@ -5,4 +5,4 @@
 /**
  *  Contains Gherkin tokenizer and language classes.
  */
-package net.sourceforge.pmd.cpd;
+package net.sourceforge.pmd.lang.gherkin.cpd;
diff --git a/pmd-gherkin/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language b/pmd-gherkin/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language
index 313dd4ddac..fbe21e1710 100644
--- a/pmd-gherkin/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language
+++ b/pmd-gherkin/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language
@@ -1 +1 @@
-net.sourceforge.pmd.cpd.GherkinLanguage
+net.sourceforge.pmd.lang.gherkin.cpd.GherkinLanguage
diff --git a/pmd-gherkin/src/test/java/net/sourceforge/pmd/cpd/GherkinTokenizerTest.java b/pmd-gherkin/src/test/java/net/sourceforge/pmd/cpd/GherkinTokenizerTest.java
index b6f0d98754..f8f064ea41 100644
--- a/pmd-gherkin/src/test/java/net/sourceforge/pmd/cpd/GherkinTokenizerTest.java
+++ b/pmd-gherkin/src/test/java/net/sourceforge/pmd/cpd/GherkinTokenizerTest.java
@@ -9,6 +9,7 @@ import java.util.Properties;
 import org.junit.Test;
 
 import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+import net.sourceforge.pmd.lang.gherkin.cpd.GherkinTokenizer;
 
 public class GherkinTokenizerTest extends CpdTextComparisonTest {
     public GherkinTokenizerTest() {