--- old/test/com/sun/javadoc/testTypeAnnotations/typeannos/TypeParameters.java	Fri Jan 22 12:28:18 2016
+++ /dev/null	Fri Jan 22 12:28:18 2016
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package typeannos;
-
-import java.lang.annotation.*;
-
-/*
- * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
- */
-class TypUnannotated<K> { }
-class OneAnnotated<@TyParaA K> { }
-class TwoAnnotated<@TyParaA K, @TyParaA V> { }
-class SecondAnnotated<K, @TyParaA V extends String> { }
-
-class TestMethods {
-    <K> void unannotated() { }
-    <@TyParaA K> void oneAnnotated() { }
-    <@TyParaA K, @TyParaB("m") V> void twoAnnotated() { }
-    <K, @TyParaA V extends @TyParaA String> void secondAnnotated() { }
-}
-
-class UnannotatedB<K> { }
-class OneAnnotatedB<@TyParaB("m") K> { }
-class TwoAnnotatedB<@TyParaB("m") K, @TyParaB("m") V> { }
-class SecondAnnotatedB<K, @TyParaB("m") V extends @TyParaB("m") String> { }
-
-class OneAnnotatedC<@TyParaC K> { }
-class TwoAnnotatedC<@TyParaC K, @TyParaC V> { }
-class SecondAnnotatedC<K, @TyParaC V extends String> { }
-
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface TyParaA { }
-@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
-@Documented
-@interface TyParaB { String value(); }
-@Target(ElementType.TYPE_USE)
-@Documented
-@interface TyParaC { }
--- /dev/null	Fri Jan 22 12:28:18 2016
+++ new/test/jdk/javadoc/doclet/testTypeAnnotations/typeannos/TypeParameters.java	Fri Jan 22 12:28:17 2016
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package typeannos;
+
+import java.lang.annotation.*;
+
+/*
+ * This class is replicated from test/tools/javac/annotations/typeAnnotations/newlocations.
+ */
+class TypUnannotated<K> { }
+class OneAnnotated<@TyParaA K> { }
+class TwoAnnotated<@TyParaA K, @TyParaA V> { }
+class SecondAnnotated<K, @TyParaA V extends String> { }
+
+class TestMethods {
+    <K> void unannotated() { }
+    <@TyParaA K> void oneAnnotated() { }
+    <@TyParaA K, @TyParaB("m") V> void twoAnnotated() { }
+    <K, @TyParaA V extends @TyParaA String> void secondAnnotated() { }
+}
+
+class UnannotatedB<K> { }
+class OneAnnotatedB<@TyParaB("m") K> { }
+class TwoAnnotatedB<@TyParaB("m") K, @TyParaB("m") V> { }
+class SecondAnnotatedB<K, @TyParaB("m") V extends @TyParaB("m") String> { }
+
+class OneAnnotatedC<@TyParaC K> { }
+class TwoAnnotatedC<@TyParaC K, @TyParaC V> { }
+class SecondAnnotatedC<K, @TyParaC V extends String> { }
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@Documented
+@interface TyParaA { }
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@Documented
+@interface TyParaB { String value(); }
+@Target(ElementType.TYPE_USE)
+@Documented
+@interface TyParaC { }