diff --git a/jdk/test/sun/security/krb5/ConfPlusProp.java b/jdk/test/sun/security/krb5/config/ConfPlusProp.java
similarity index 100%
rename from jdk/test/sun/security/krb5/ConfPlusProp.java
rename to jdk/test/sun/security/krb5/config/ConfPlusProp.java
diff --git a/jdk/test/sun/security/krb5/ConfigWithQuotations.java b/jdk/test/sun/security/krb5/config/ConfigWithQuotations.java
similarity index 100%
rename from jdk/test/sun/security/krb5/ConfigWithQuotations.java
rename to jdk/test/sun/security/krb5/config/ConfigWithQuotations.java
diff --git a/jdk/test/sun/security/krb5/DnsFallback.java b/jdk/test/sun/security/krb5/config/DnsFallback.java
similarity index 100%
rename from jdk/test/sun/security/krb5/DnsFallback.java
rename to jdk/test/sun/security/krb5/config/DnsFallback.java
diff --git a/jdk/test/sun/security/krb5/ParseCAPaths.java b/jdk/test/sun/security/krb5/config/ParseCAPaths.java
similarity index 100%
rename from jdk/test/sun/security/krb5/ParseCAPaths.java
rename to jdk/test/sun/security/krb5/config/ParseCAPaths.java
diff --git a/jdk/test/sun/security/krb5/ParseConfig.java b/jdk/test/sun/security/krb5/config/ParseConfig.java
similarity index 100%
rename from jdk/test/sun/security/krb5/ParseConfig.java
rename to jdk/test/sun/security/krb5/config/ParseConfig.java
diff --git a/jdk/test/sun/security/krb5/confplusprop.conf b/jdk/test/sun/security/krb5/config/confplusprop.conf
similarity index 100%
rename from jdk/test/sun/security/krb5/confplusprop.conf
rename to jdk/test/sun/security/krb5/config/confplusprop.conf
diff --git a/jdk/test/sun/security/krb5/confplusprop2.conf b/jdk/test/sun/security/krb5/config/confplusprop2.conf
similarity index 100%
rename from jdk/test/sun/security/krb5/confplusprop2.conf
rename to jdk/test/sun/security/krb5/config/confplusprop2.conf
diff --git a/jdk/test/sun/security/krb5/edu.mit.Kerberos b/jdk/test/sun/security/krb5/config/edu.mit.Kerberos
similarity index 100%
rename from jdk/test/sun/security/krb5/edu.mit.Kerberos
rename to jdk/test/sun/security/krb5/config/edu.mit.Kerberos
diff --git a/jdk/test/sun/security/krb5/krb5-capaths.conf b/jdk/test/sun/security/krb5/config/krb5-capaths.conf
similarity index 100%
rename from jdk/test/sun/security/krb5/krb5-capaths.conf
rename to jdk/test/sun/security/krb5/config/krb5-capaths.conf
diff --git a/jdk/test/sun/security/krb5/krb5.conf b/jdk/test/sun/security/krb5/config/krb5.conf
similarity index 100%
rename from jdk/test/sun/security/krb5/krb5.conf
rename to jdk/test/sun/security/krb5/config/krb5.conf