diff --git a/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/SessionPropertyConfigurationManagerPlugin.java b/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/SessionPropertyConfigurationManagerPlugin.java
index 91c36ddfe535..a8da9a273eac 100644
--- a/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/SessionPropertyConfigurationManagerPlugin.java
+++ b/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/SessionPropertyConfigurationManagerPlugin.java
@@ -15,6 +15,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.prestosql.plugin.session.db.DbSessionPropertyManagerFactory;
+import io.prestosql.plugin.session.file.FileSessionPropertyManagerFactory;
 import io.prestosql.spi.Plugin;
 import io.prestosql.spi.session.SessionPropertyConfigurationManagerFactory;
 
diff --git a/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/FileSessionPropertyManager.java b/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/file/FileSessionPropertyManager.java
similarity index 97%
rename from presto-session-property-managers/src/main/java/io/prestosql/plugin/session/FileSessionPropertyManager.java
rename to presto-session-property-managers/src/main/java/io/prestosql/plugin/session/file/FileSessionPropertyManager.java
index c9a860d2d4a2..03575c9b6f77 100644
--- a/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/FileSessionPropertyManager.java
+++ b/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/file/FileSessionPropertyManager.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.prestosql.plugin.session;
+package io.prestosql.plugin.session.file;
 
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
@@ -19,6 +19,7 @@
 import io.airlift.json.JsonCodec;
 import io.airlift.json.JsonCodecFactory;
 import io.airlift.json.ObjectMapperProvider;
+import io.prestosql.plugin.session.SessionMatchSpec;
 import io.prestosql.spi.session.SessionConfigurationContext;
 import io.prestosql.spi.session.SessionPropertyConfigurationManager;
 
diff --git a/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/FileSessionPropertyManagerConfig.java b/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/file/FileSessionPropertyManagerConfig.java
similarity index 96%
rename from presto-session-property-managers/src/main/java/io/prestosql/plugin/session/FileSessionPropertyManagerConfig.java
rename to presto-session-property-managers/src/main/java/io/prestosql/plugin/session/file/FileSessionPropertyManagerConfig.java
index a6c6009312f8..4a503f899ae6 100644
--- a/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/FileSessionPropertyManagerConfig.java
+++ b/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/file/FileSessionPropertyManagerConfig.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.prestosql.plugin.session;
+package io.prestosql.plugin.session.file;
 
 import io.airlift.configuration.Config;
 
diff --git a/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/FileSessionPropertyManagerFactory.java b/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/file/FileSessionPropertyManagerFactory.java
similarity index 97%
rename from presto-session-property-managers/src/main/java/io/prestosql/plugin/session/FileSessionPropertyManagerFactory.java
rename to presto-session-property-managers/src/main/java/io/prestosql/plugin/session/file/FileSessionPropertyManagerFactory.java
index d5c6f4a275ce..f7968cd87aed 100644
--- a/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/FileSessionPropertyManagerFactory.java
+++ b/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/file/FileSessionPropertyManagerFactory.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.prestosql.plugin.session;
+package io.prestosql.plugin.session.file;
 
 import com.google.inject.Injector;
 import io.airlift.bootstrap.Bootstrap;
diff --git a/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/FileSessionPropertyManagerModule.java b/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/file/FileSessionPropertyManagerModule.java
similarity index 96%
rename from presto-session-property-managers/src/main/java/io/prestosql/plugin/session/FileSessionPropertyManagerModule.java
rename to presto-session-property-managers/src/main/java/io/prestosql/plugin/session/file/FileSessionPropertyManagerModule.java
index d6a937488d7f..02591b5f8bbc 100644
--- a/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/FileSessionPropertyManagerModule.java
+++ b/presto-session-property-managers/src/main/java/io/prestosql/plugin/session/file/FileSessionPropertyManagerModule.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.prestosql.plugin.session;
+package io.prestosql.plugin.session.file;
 
 import com.google.inject.Binder;
 import com.google.inject.Module;
diff --git a/presto-session-property-managers/src/test/java/io/prestosql/plugin/session/TestFileSessionPropertyManager.java b/presto-session-property-managers/src/test/java/io/prestosql/plugin/session/file/TestFileSessionPropertyManager.java
similarity index 86%
rename from presto-session-property-managers/src/test/java/io/prestosql/plugin/session/TestFileSessionPropertyManager.java
rename to presto-session-property-managers/src/test/java/io/prestosql/plugin/session/file/TestFileSessionPropertyManager.java
index 385264e5ac7a..43706b4650a2 100644
--- a/presto-session-property-managers/src/test/java/io/prestosql/plugin/session/TestFileSessionPropertyManager.java
+++ b/presto-session-property-managers/src/test/java/io/prestosql/plugin/session/file/TestFileSessionPropertyManager.java
@@ -12,9 +12,11 @@
  * limitations under the License.
  */
 
-package io.prestosql.plugin.session;
+package io.prestosql.plugin.session.file;
 
 import io.airlift.testing.TempFile;
+import io.prestosql.plugin.session.AbstractTestSessionPropertyManager;
+import io.prestosql.plugin.session.SessionMatchSpec;
 import io.prestosql.spi.session.SessionPropertyConfigurationManager;
 
 import java.io.IOException;
@@ -23,7 +25,7 @@
 import java.util.Arrays;
 import java.util.Map;
 
-import static io.prestosql.plugin.session.FileSessionPropertyManager.CODEC;
+import static io.prestosql.plugin.session.file.FileSessionPropertyManager.CODEC;
 import static org.testng.Assert.assertEquals;
 
 public class TestFileSessionPropertyManager
diff --git a/presto-session-property-managers/src/test/java/io/prestosql/plugin/session/TestFileSessionPropertyManagerConfig.java b/presto-session-property-managers/src/test/java/io/prestosql/plugin/session/file/TestFileSessionPropertyManagerConfig.java
similarity index 97%
rename from presto-session-property-managers/src/test/java/io/prestosql/plugin/session/TestFileSessionPropertyManagerConfig.java
rename to presto-session-property-managers/src/test/java/io/prestosql/plugin/session/file/TestFileSessionPropertyManagerConfig.java
index f8f19990000a..e6fea3c25f5d 100644
--- a/presto-session-property-managers/src/test/java/io/prestosql/plugin/session/TestFileSessionPropertyManagerConfig.java
+++ b/presto-session-property-managers/src/test/java/io/prestosql/plugin/session/file/TestFileSessionPropertyManagerConfig.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.prestosql.plugin.session;
+package io.prestosql.plugin.session.file;
 
 import com.google.common.collect.ImmutableMap;
 import org.testng.annotations.Test;