diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/ApiEvent.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/api/ApiEvent.scala
similarity index 100%
rename from src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/ApiEvent.scala
rename to src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/api/ApiEvent.scala
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/MetricsLoggable.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/api/MetricsLoggable.scala
similarity index 100%
rename from src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/MetricsLoggable.scala
rename to src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/api/MetricsLoggable.scala
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/RegisteredUserApiEvent.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/api/RegisteredUserApiEvent.scala
similarity index 100%
rename from src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/RegisteredUserApiEvent.scala
rename to src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/api/RegisteredUserApiEvent.scala
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/RequestEventDetails.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/api/RequestEventDetails.scala
similarity index 100%
rename from src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/RequestEventDetails.scala
rename to src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/api/RequestEventDetails.scala
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/ResponseEventDetails.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/api/ResponseEventDetails.scala
similarity index 100%
rename from src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/ResponseEventDetails.scala
rename to src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/api/ResponseEventDetails.scala
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/UnregisteredUserApiEvent.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/api/UnregisteredUserApiEvent.scala
similarity index 100%
rename from src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/UnregisteredUserApiEvent.scala
rename to src/main/scala/org/broadinstitute/dsde/workbench/sam/metrics/api/UnregisteredUserApiEvent.scala