diff --git a/pmd-tsql/src/main/antlr4/net/sourceforge/pmd/lang/tsql/antlr4/TSqlLexer.g4 b/pmd-tsql/src/main/antlr4/net/sourceforge/pmd/lang/tsql/ast/TSqlLexer.g4
similarity index 100%
rename from pmd-tsql/src/main/antlr4/net/sourceforge/pmd/lang/tsql/antlr4/TSqlLexer.g4
rename to pmd-tsql/src/main/antlr4/net/sourceforge/pmd/lang/tsql/ast/TSqlLexer.g4
diff --git a/pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/TSqlLanguageModule.java b/pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/TSqlLanguageModule.java
deleted file mode 100644
index 14004d5ec2..0000000000
--- a/pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/TSqlLanguageModule.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.tsql;
-
-import net.sourceforge.pmd.lang.BaseLanguageModule;
-
-/**
- * Language Module for T-SQL.
- * @deprecated There is no full PMD support for T-SQL.
- */
-@Deprecated
-public class TSqlLanguageModule extends BaseLanguageModule {
-
-    /** The name. */
-    public static final String NAME = "T-SQL";
-    /** The terse name. */
-    public static final String TERSE_NAME = "tsql";
-
-    /**
-     * Create a new instance of TSql Language Module.
-     */
-    public TSqlLanguageModule() {
-        super(NAME, null, TERSE_NAME, "tsql");
-        addVersion("1", null, true);
-    }
-}
diff --git a/pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/antlr4/package-info.java b/pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/ast/package-info.java
similarity index 65%
rename from pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/antlr4/package-info.java
rename to pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/ast/package-info.java
index 1dc8e4def3..b122486f6e 100644
--- a/pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/antlr4/package-info.java
+++ b/pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/ast/package-info.java
@@ -2,4 +2,4 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.tsql.antlr4;
+package net.sourceforge.pmd.lang.tsql.ast;
diff --git a/pmd-tsql/src/main/java/net/sourceforge/pmd/cpd/TSqlLanguage.java b/pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/cpd/TSqlLanguage.java
similarity index 75%
rename from pmd-tsql/src/main/java/net/sourceforge/pmd/cpd/TSqlLanguage.java
rename to pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/cpd/TSqlLanguage.java
index 61f73642d3..7f087b1238 100644
--- a/pmd-tsql/src/main/java/net/sourceforge/pmd/cpd/TSqlLanguage.java
+++ b/pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/cpd/TSqlLanguage.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.tsql.cpd;
+
+import net.sourceforge.pmd.cpd.AbstractLanguage;
 
 /**
  * @author pguyot@kallisys.net
diff --git a/pmd-tsql/src/main/java/net/sourceforge/pmd/cpd/TSqlTokenizer.java b/pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/cpd/TSqlTokenizer.java
similarity index 73%
rename from pmd-tsql/src/main/java/net/sourceforge/pmd/cpd/TSqlTokenizer.java
rename to pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/cpd/TSqlTokenizer.java
index 2b860c369d..ab0eb24a57 100644
--- a/pmd-tsql/src/main/java/net/sourceforge/pmd/cpd/TSqlTokenizer.java
+++ b/pmd-tsql/src/main/java/net/sourceforge/pmd/lang/tsql/cpd/TSqlTokenizer.java
@@ -2,12 +2,14 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd;
+package net.sourceforge.pmd.lang.tsql.cpd;
 
 import org.antlr.v4.runtime.CharStream;
 
+import net.sourceforge.pmd.cpd.AntlrTokenizer;
+import net.sourceforge.pmd.cpd.SourceCode;
 import net.sourceforge.pmd.lang.antlr.AntlrTokenManager;
-import net.sourceforge.pmd.lang.tsql.antlr4.TSqlLexer;
+import net.sourceforge.pmd.lang.tsql.ast.TSqlLexer;
 
 public class TSqlTokenizer extends AntlrTokenizer {
 
diff --git a/pmd-tsql/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language b/pmd-tsql/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language
index 472e9096aa..1baf52236f 100644
--- a/pmd-tsql/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language
+++ b/pmd-tsql/src/main/resources/META-INF/services/net.sourceforge.pmd.cpd.Language
@@ -1 +1 @@
-net.sourceforge.pmd.cpd.TSqlLanguage
+net.sourceforge.pmd.lang.tsql.cpd.TSqlLanguage
diff --git a/pmd-tsql/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language b/pmd-tsql/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
deleted file mode 100644
index 59fe8792ad..0000000000
--- a/pmd-tsql/src/main/resources/META-INF/services/net.sourceforge.pmd.lang.Language
+++ /dev/null
@@ -1 +0,0 @@
-net.sourceforge.pmd.lang.tsql.TSqlLanguageModule
diff --git a/pmd-tsql/src/test/java/net/sourceforge/pmd/cpd/TSqlTokenizerTest.java b/pmd-tsql/src/test/java/net/sourceforge/pmd/lang/tsql/cpd/TSqlTokenizerTest.java
similarity index 85%
rename from pmd-tsql/src/test/java/net/sourceforge/pmd/cpd/TSqlTokenizerTest.java
rename to pmd-tsql/src/test/java/net/sourceforge/pmd/lang/tsql/cpd/TSqlTokenizerTest.java
index 250755eb11..899147f996 100644
--- a/pmd-tsql/src/test/java/net/sourceforge/pmd/cpd/TSqlTokenizerTest.java
+++ b/pmd-tsql/src/test/java/net/sourceforge/pmd/lang/tsql/cpd/TSqlTokenizerTest.java
@@ -2,12 +2,13 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.cpd;
+package net.sourceforge.pmd.lang.tsql.cpd;
 
 import java.util.Properties;
 
 import org.junit.Test;
 
+import net.sourceforge.pmd.cpd.Tokenizer;
 import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
 
 public class TSqlTokenizerTest extends CpdTextComparisonTest {
@@ -23,7 +24,7 @@ public class TSqlTokenizerTest extends CpdTextComparisonTest {
 
     @Override
     protected String getResourcePrefix() {
-        return "../lang/tsql/cpd/testdata";
+        return "../cpd/testdata";
     }
 
     @Test