diff --git a/NOTES b/NOTES
new file mode 100644
index 0000000..b31b9bf
--- /dev/null
+++ b/NOTES
@@ -0,0 +1,6 @@
+
+ * Kafka for log
+ * Remove all @Deprecated features
+
+ * Nested transactions
+
diff --git a/build.sbt b/build.sbt
index 2b98566..d4da6a0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -22,14 +22,22 @@ inThisBuild(
         url("https://greg.burd.me")
       )
     ),
-    scalaVersion := scala213,
+    scalaVersion := scala212,
     crossScalaVersions := List(scala213, scala212, scala211),
     resolvers += Resolver.sonatypeRepo("releases"),
     libraryDependencies ++= List(
       scalatest.value % Test,
       scalacheck % Test,
       scalametaTestkit % Test
-    )
+    ),
+    scalacOptions ++= {
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, 11)) => Seq("-target:jvm-1.8")
+        case Some((2, 12)) => Seq("-target:jvm-1.8")
+        case Some((2, 13)) => Seq("-target:jvm-1.8")
+        case _ => Seq.empty
+      }
+    }
   )
 )
 
@@ -39,7 +47,8 @@ commands += Command.command("ci-test") { s =>
   val scalaVersion = sys.env.get("TEST") match {
     case Some("2.11") => scala211
     case Some("2.12") => scala212
-    case _ => scala213
+    case Some("2.13") => scala213
+    case _ => scala212
   }
   val docsTest = if (scalaVersion == scala213) "docs/run" else "version"
   s"++$scalaVersion" ::
@@ -64,27 +73,19 @@ lazy val core = project
   )
   .enablePlugins(BuildInfoPlugin)
 
-lazy val cli = project
-  .in(file("stasis-cli"))
+lazy val persist = project
+  .in(file("stasis-persist"))
   .settings(
-    moduleName := "stasis-cli",
-    mainClass in assembly := Some("io.stasis.cli.Cli"),
-    assemblyJarName.in(assembly) := "stasis.jar",
-    libraryDependencies ++= Seq(
-      "com.googlecode.java-diff-utils" % "diffutils" % "1.3.0",
-      "com.martiansoftware" % "nailgun-server" % "0.9.1",
-      "com.github.scopt" %% "scopt" % "3.5.0",
-      // undeclared transitive dependency of coursier-small
-      "org.scala-lang.modules" %% "scala-xml" % "1.1.1"
-    ),
-    scalacOptions ++= {
-      CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((2, 11)) => Seq("-target:jvm-1.8")
-        case Some((2, 12)) => Seq("-target:jvm-1.8")
-        case Some((2, 13)) => Seq("-target:jvm-1.8")
-        case _ => Seq.empty
-      }
-    }
+    moduleName := "stasis-persist",
+    assemblyJarName.in(assembly) := "stasis-persist.jar",
+  )
+  .dependsOn(core)
+
+lazy val rep = project
+  .in(file("stasis-rep"))
+  .settings(
+    moduleName := "stasis-rep",
+    assemblyJarName.in(assembly) := "stasis-rep.jar"
   )
   .dependsOn(core)
 
@@ -105,6 +106,8 @@ lazy val buildInfoSettings: Seq[Def.Setting[_]] = Seq(
     "stable" -> stableVersion.value,
     "scala" -> scalaVersion.value,
     "scala211" -> scala211,
+    "scala212" -> scala212,
+    "scala213" -> scala213,
     "coursier" -> coursier,
     "commit" -> sys.process.Process("git rev-parse HEAD").lineStream_!.head,
     "timestamp" -> System.currentTimeMillis().toString,
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEConnection.java b/je-7.5.11/src/com/sleepycat/je/jca/ra/JEConnection.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEConnection.java
rename to je-7.5.11/src/com/sleepycat/je/jca/ra/JEConnection.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEConnectionFactory.java b/je-7.5.11/src/com/sleepycat/je/jca/ra/JEConnectionFactory.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEConnectionFactory.java
rename to je-7.5.11/src/com/sleepycat/je/jca/ra/JEConnectionFactory.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEConnectionFactoryImpl.java b/je-7.5.11/src/com/sleepycat/je/jca/ra/JEConnectionFactoryImpl.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEConnectionFactoryImpl.java
rename to je-7.5.11/src/com/sleepycat/je/jca/ra/JEConnectionFactoryImpl.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEConnectionMetaData.java b/je-7.5.11/src/com/sleepycat/je/jca/ra/JEConnectionMetaData.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEConnectionMetaData.java
rename to je-7.5.11/src/com/sleepycat/je/jca/ra/JEConnectionMetaData.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEException.java b/je-7.5.11/src/com/sleepycat/je/jca/ra/JEException.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEException.java
rename to je-7.5.11/src/com/sleepycat/je/jca/ra/JEException.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jca/ra/JELocalTransaction.java b/je-7.5.11/src/com/sleepycat/je/jca/ra/JELocalTransaction.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jca/ra/JELocalTransaction.java
rename to je-7.5.11/src/com/sleepycat/je/jca/ra/JELocalTransaction.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEManagedConnection.java b/je-7.5.11/src/com/sleepycat/je/jca/ra/JEManagedConnection.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEManagedConnection.java
rename to je-7.5.11/src/com/sleepycat/je/jca/ra/JEManagedConnection.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEManagedConnectionFactory.java b/je-7.5.11/src/com/sleepycat/je/jca/ra/JEManagedConnectionFactory.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jca/ra/JEManagedConnectionFactory.java
rename to je-7.5.11/src/com/sleepycat/je/jca/ra/JEManagedConnectionFactory.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jca/ra/JERequestInfo.java b/je-7.5.11/src/com/sleepycat/je/jca/ra/JERequestInfo.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jca/ra/JERequestInfo.java
rename to je-7.5.11/src/com/sleepycat/je/jca/ra/JERequestInfo.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jca/ra/package.html b/je-7.5.11/src/com/sleepycat/je/jca/ra/package.html
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jca/ra/package.html
rename to je-7.5.11/src/com/sleepycat/je/jca/ra/package.html
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jca/ra/ra.xml b/je-7.5.11/src/com/sleepycat/je/jca/ra/ra.xml
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jca/ra/ra.xml
rename to je-7.5.11/src/com/sleepycat/je/jca/ra/ra.xml
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jmx/JEDiagnostics.java b/je-7.5.11/src/com/sleepycat/je/jmx/JEDiagnostics.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jmx/JEDiagnostics.java
rename to je-7.5.11/src/com/sleepycat/je/jmx/JEDiagnostics.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jmx/JEMBean.java b/je-7.5.11/src/com/sleepycat/je/jmx/JEMBean.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jmx/JEMBean.java
rename to je-7.5.11/src/com/sleepycat/je/jmx/JEMBean.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jmx/JEMBeanHelper.java b/je-7.5.11/src/com/sleepycat/je/jmx/JEMBeanHelper.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jmx/JEMBeanHelper.java
rename to je-7.5.11/src/com/sleepycat/je/jmx/JEMBeanHelper.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jmx/JEMonitor.java b/je-7.5.11/src/com/sleepycat/je/jmx/JEMonitor.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jmx/JEMonitor.java
rename to je-7.5.11/src/com/sleepycat/je/jmx/JEMonitor.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jmx/package.html b/je-7.5.11/src/com/sleepycat/je/jmx/package.html
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jmx/package.html
rename to je-7.5.11/src/com/sleepycat/je/jmx/package.html
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/JEStats.java b/je-7.5.11/src/com/sleepycat/je/jmx/plugin/JEStats.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/JEStats.java
rename to je-7.5.11/src/com/sleepycat/je/jmx/plugin/JEStats.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/JEStatsPlugin.java b/je-7.5.11/src/com/sleepycat/je/jmx/plugin/JEStatsPlugin.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/JEStatsPlugin.java
rename to je-7.5.11/src/com/sleepycat/je/jmx/plugin/JEStatsPlugin.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/Stats.java b/je-7.5.11/src/com/sleepycat/je/jmx/plugin/Stats.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/Stats.java
rename to je-7.5.11/src/com/sleepycat/je/jmx/plugin/Stats.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/StatsPlugin.java b/je-7.5.11/src/com/sleepycat/je/jmx/plugin/StatsPlugin.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/StatsPlugin.java
rename to je-7.5.11/src/com/sleepycat/je/jmx/plugin/StatsPlugin.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/StatsSwingWorker.java b/je-7.5.11/src/com/sleepycat/je/jmx/plugin/StatsSwingWorker.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/StatsSwingWorker.java
rename to je-7.5.11/src/com/sleepycat/je/jmx/plugin/StatsSwingWorker.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/package-info.java b/je-7.5.11/src/com/sleepycat/je/jmx/plugin/package-info.java
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/package-info.java
rename to je-7.5.11/src/com/sleepycat/je/jmx/plugin/package-info.java
diff --git a/stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/services/com.sun.tools.jconsole.JConsolePlugin b/je-7.5.11/src/com/sleepycat/je/jmx/plugin/services/com.sun.tools.jconsole.JConsolePlugin
similarity index 100%
rename from stasis-core/src/main/java/com/sleepycat/je/jmx/plugin/services/com.sun.tools.jconsole.JConsolePlugin
rename to je-7.5.11/src/com/sleepycat/je/jmx/plugin/services/com.sun.tools.jconsole.JConsolePlugin
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index beddd5b..2099bba 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -1,6 +1,5 @@
 import sbt._
 import sbt.Keys._
-import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
 // scalafmt: { maxColumn = 120, style = defaultWithAlign }
 
@@ -42,5 +41,5 @@ object Dependencies {
   val metaconfig = Def.setting("com.geirsson" %%% "metaconfig-core" % metaconfigV)
   val metaconfigTypesafe = Def.setting("com.geirsson" %%% "metaconfig-typesafe-config" % metaconfigV)
   val metaconfigHocon = Def.setting("com.geirsson" %%% "metaconfig-hocon" % metaconfigV)
-
+  
 }
diff --git a/project/Mima.scala b/project/Mima.scala
index 74025ec..144f508 100644
--- a/project/Mima.scala
+++ b/project/Mima.scala
@@ -5,7 +5,7 @@ object Mima {
     // After v0.5, start running mima checks in CI and document breaking changes here.
     // See https://github.com/typesafehub/migration-manager/wiki/sbt-plugin#basic-usage
     Seq(
-      // Essentially, only org.scalafmt.Scalafmt is protected by bincompat guarantees.
+      // Essentially, only the following are protected by bincompat guarantees.
       ProblemFilters.exclude[Problem]("io.stasis.cli.*"),
     )
   }
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 7f4e8bd..9c38e4f 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -11,7 +11,7 @@ addSbtPlugin("org.scalameta" % "sbt-mdoc" % "1.2.7")
 addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.6.0-RC4")
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.2")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M14-4") //coursier.util.Properties.version)
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "2.0.0-RC2-3") //coursier.util.Properties.version)
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.4")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.5.0")
diff --git a/stasis-cli/src/main/scala/io/stasis/cli/Cli.scala b/stasis-cli/src/main/scala/io/stasis/cli/Cli.scala
deleted file mode 100644
index 781dabe..0000000
--- a/stasis-cli/src/main/scala/io/stasis/cli/Cli.scala
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.scalafmt.cli
-
-import com.martiansoftware.nailgun.NGContext
-import java.io.{InputStream, PrintStream}
-import org.scalafmt.Versions
-import org.scalafmt.util.AbsoluteFile
-
-import scala.util.control.NoStackTrace
-
-object Cli {
-  def nailMain(nGContext: NGContext): Unit = {
-    val workingDirectory =
-      AbsoluteFile.fromPath(nGContext.getWorkingDirectory).getOrElse {
-        throw new IllegalStateException(
-          s"Expected absolute path, " +
-            s"obtained nGContext.getWorkingDirectory = ${nGContext.getWorkingDirectory}"
-        )
-      }
-    val exit = mainWithOptions(
-      nGContext.getArgs,
-      CliOptions.default.copy(
-        common = CliOptions.default.common.copy(
-          workingDirectory = workingDirectory,
-          out = nGContext.out,
-          in = nGContext.in,
-          err = nGContext.err
-        )
-      )
-    )
-    nGContext.exit(exit.code)
-  }
-
-  def main(
-      args: Array[String],
-      in: InputStream,
-      out: PrintStream,
-      err: PrintStream,
-      workingDirectory: String
-  ): Unit = {
-    val options = CliOptions.default.copy(
-      common = CommonOptions(
-        in = in,
-        out = out,
-        err = err,
-        workingDirectory = AbsoluteFile.fromPath(workingDirectory).get
-      )
-    )
-    mainWithOptions(args, options)
-  }
-
-  private def throwIfError(exit: ExitCode): Unit = {
-    if (exit != ExitCode.Ok) {
-      throw new RuntimeException(exit.toString) with NoStackTrace
-    }
-  }
-
-  def main(args: Array[String]): Unit = {
-    val exit = mainWithOptions(args, CliOptions())
-    sys.exit(exit.code)
-  }
-
-  def exceptionThrowingMain(args: Array[String]): Unit = {
-    val exit = mainWithOptions(args, CliOptions.default)
-    throwIfError(exit)
-  }
-
-  def mainWithOptions(args: Array[String], options: CliOptions): ExitCode = {
-    getConfig(args, options) match {
-      case Some(x) => run(x)
-      case None => ExitCode.CommandLineArgumentError
-    }
-  }
-
-  def getConfig(args: Array[String], init: CliOptions): Option[CliOptions] = {
-    CliArgParser.scoptParser.parse(args, init).map(CliOptions.auto(args, init))
-  }
-
-  private[cli] def run(options: CliOptions): ExitCode = {
-    val termDisplayMessage =
-      if (options.testing) "Looking for unformatted files..."
-      else "Reformatting..."
-    if (options.debug) {
-      val pwd = options.common.workingDirectory.jfile.getPath
-      val out = options.info
-      out.println("Working directory: " + pwd)
-    }
-
-    // Run format using
-    // - `scalafmt-dynamic` if the specified `version` setting doesn't match build version.
-    // - `scalafmt-core` if the specified `version` setting match with build version
-    //   (or if the `version` is not specified).
-    val runner: ScalafmtRunner = options.version match {
-      case None => ScalafmtCoreRunner
-      case Some(v) if v == Versions.version =>
-        ScalafmtCoreRunner
-      case _ => ScalafmtDynamicRunner
-    }
-    val exit = runner.run(options, termDisplayMessage)
-
-    if (options.testing) {
-      if (exit.isOk) {
-        options.common.out.println("All files are formatted with scalafmt :)")
-      } else if (exit.is(ExitCode.TestError)) {
-        options.common.out.println(
-          "error: --test failed"
-        )
-        options.onTestFailure.foreach(options.common.out.println)
-      } else {
-        options.common.out.println(s"error: $exit")
-      }
-    }
-    if (options.testing &&
-      !options.fatalWarnings &&
-      !exit.is(ExitCode.TestError)) {
-      // Ignore parse errors etc.
-      ExitCode.Ok
-    } else {
-      exit
-    }
-  }
-}
diff --git a/stasis-cli/src/main/scala/io/stasis/cli/CliArgParser.scala b/stasis-cli/src/main/scala/io/stasis/cli/CliArgParser.scala
deleted file mode 100644
index 3d97f08..0000000
--- a/stasis-cli/src/main/scala/io/stasis/cli/CliArgParser.scala
+++ /dev/null
@@ -1,190 +0,0 @@
-package org.scalafmt.cli
-
-import java.io.File
-import java.util.Date
-
-import org.scalafmt.Versions
-import org.scalafmt.util.AbsoluteFile
-import scopt.OptionParser
-
-object CliArgParser {
-
-  val usageExamples: String =
-    """|scalafmt # Format all files in the current project, configuration is determined in this order:
-       |         # 1. .scalafmt.conf file in current directory
-       |         # 2. .scalafmt.conf inside root directory of current git repo
-       |         # 3. no configuration, default style
-       |scalafmt --test # throw exception on mis-formatted files, won't write to files.
-       |scalafmt --mode diff # Format all files that were edited in git diff against master branch.
-       |scalafmt --mode changed # Format files listed in `git status` (latest changes against previous commit.
-       |scalafmt --diff-branch 2.x # same as --diff, except against branch 2.x
-       |scalafmt --stdin # read from stdin and print to stdout
-       |scalafmt --stdin --assume-filename foo.sbt < foo.sbt # required when using --stdin to format .sbt files.
-       |scalafmt Code1.scala A.scala       # write formatted contents to file.
-       |scalafmt --stdout Code.scala       # print formatted contents to stdout.
-       |scalafmt --exclude target          # format all files in directory excluding target
-       |scalafmt --config .scalafmt.conf   # read custom style from file.
-       |scalafmt --config-str "style=IntelliJ" # define custom style as a flag, must be quoted.""".stripMargin
-
-  val scoptParser: OptionParser[CliOptions] =
-    new scopt.OptionParser[CliOptions]("scalafmt") {
-      override def showUsageOnError = false
-
-      private def printAndExit(
-          inludeUsage: Boolean
-      )(ignore: Unit, c: CliOptions): CliOptions = {
-        if (inludeUsage) showUsage
-        else showHeader
-        sys.exit
-        c
-      }
-
-      private def readConfig(contents: String, c: CliOptions): CliOptions = {
-        c.copy(configStr = Some(contents))
-      }
-
-      private def readConfigFromFile(
-          file: String,
-          c: CliOptions
-      ): CliOptions = {
-        val configFile =
-          AbsoluteFile.fromFile(new File(file), c.common.workingDirectory)
-        c.copy(config = Some(configFile.jfile.toPath))
-      }
-
-      private def addFile(file: File, c: CliOptions): CliOptions = {
-        val absFile = AbsoluteFile.fromFile(file, c.common.workingDirectory)
-        c.copy(customFiles = c.customFiles :+ absFile)
-      }
-
-      head("scalafmt", Versions.nightly)
-      opt[Unit]('h', "help")
-        .action(printAndExit(inludeUsage = true))
-        .text("prints this usage text")
-      opt[Unit]('v', "version")
-        .action(printAndExit(inludeUsage = false))
-        .text("print version ")
-
-      arg[File]("<file>...")
-        .optional()
-        .unbounded()
-        .action((file, c) => addFile(file, c))
-        .text(
-          "file or directory, in which case all *.scala files are formatted."
-        )
-
-      opt[Seq[File]]('f', "files")
-        .action { (files, c) =>
-          c.copy(
-            customFiles =
-              AbsoluteFile.fromFiles(files, c.common.workingDirectory)
-          )
-        }
-        .hidden() // this option isn't needed anymore. Simply pass the files as
-        // arguments. Keeping for backwards compatibility
-        .text(
-          "file or directory, in which case all *.scala files are formatted. Deprecated: pass files as arguments"
-        )
-
-      opt[Unit]('i', "in-place")
-        .action((opt, c) => c.copy(writeMode = Override))
-        .hidden() // this option isn't needed anymore. Simply don't pass
-        // --stdout. Keeping for backwards compatibility
-        .text("format files in-place (default)")
-
-      opt[Unit]("stdout")
-        .action((opt, c) => c.copy(writeMode = Stdout))
-        .text("write formatted files to stdout")
-
-      opt[Boolean]("git")
-        .action((opt, c) => c.copy(git = Some(opt)))
-        .text("if true, ignore files in .gitignore (default false)")
-      opt[Seq[String]]("exclude")
-        .action((excludes, c) => c.copy(customExcludes = excludes))
-        .text(
-          "file or directory, in which case all *.scala files are formatted."
-        )
-      opt[String]('c', "config")
-        .action(readConfigFromFile)
-        .text("a file path to .scalafmt.conf.")
-      opt[String]("config-str")
-        .action(readConfig)
-        .text("configuration defined as a string")
-      opt[Unit]("stdin")
-        .action((_, c) => c.copy(stdIn = true))
-        .text("read from stdin and print to stdout")
-      opt[Unit]("no-stderr")
-        .action((_, c) => c.copy(noStdErr = true))
-        .text("don't use strerr for messages, output to stdout")
-      opt[String]("assume-filename")
-        .action((filename, c) => c.copy(assumeFilename = filename))
-        .text(
-          "when using --stdin, use --assume-filename to hint to scalafmt that the input is an .sbt file."
-        )
-      opt[Unit]("test")
-        .action((_, c) => c.copy(testing = true))
-        .text("test for mis-formatted code, exits with status 1 on failure.")
-      opt[File]("migrate2hocon")
-        .action(
-          (file, c) =>
-            c.copy(
-              migrate =
-                Some(AbsoluteFile.fromFile(file, c.common.workingDirectory))
-            )
-        )
-        .text(
-          """migrate .scalafmt CLI style configuration to hocon style configuration in .scalafmt.conf"""
-        )
-      opt[Unit]("diff")
-        .action((_, c) => c.copy(mode = Option(DiffFiles("master"))))
-        .text(
-          s"""Format files listed in `git diff` against master.
-             |Deprecated: use --mode diff instead""".stripMargin
-        )
-      opt[FileFetchMode]("mode")
-        .action((m, c) => c.copy(mode = Option(m)))
-        .text(
-          s"""Sets the files to be formatted fetching mode.
-             |Options:
-             |        diff - format files listed in `git diff` against master
-             |        changed - format files listed in `git status` (latest changes against previous commit)""".stripMargin
-        )
-      opt[String]("diff-branch")
-        .action((branch, c) => c.copy(diff = Some(branch)))
-        .text(
-          "If set, only format edited files in git diff against provided branch. Has no effect if mode set to `changed`."
-        )
-      opt[Unit]("build-info")
-        .action({
-          case (_, c) =>
-            println(buildInfo)
-            sys.exit
-        })
-        .text("prints build information")
-      opt[Unit]("quiet")
-        .action((_, c) => c.copy(quiet = true))
-        .text("don't print out stuff to console.")
-      opt[Unit]("debug")
-        .action((_, c) => c.copy(debug = true))
-        .text("print out diagnostics to console.")
-      opt[Unit]("non-interactive")
-        .action((_, c) => c.copy(nonInteractive = true))
-        .text("disable fancy progress bar, useful in ci or sbt plugin.")
-      opt[(Int, Int)]("range")
-        .hidden()
-        .action({
-          case ((from, to), c) =>
-            val offset = if (from == to) 0 else -1
-            c.copy(range = c.range + Range(from - 1, to + offset))
-        })
-        .text("(experimental) only format line range from=to")
-
-      note(s"""|Examples:
-               |$usageExamples
-               |Please file bugs to https://github.com/scalameta/scalafmt/issues
-      """.stripMargin)
-    }
-  def buildInfo =
-    s"""build commit: ${Versions.commit}
-       |build time: ${new Date(Versions.timestamp.toLong)}""".stripMargin
-}
diff --git a/stasis-cli/src/main/scala/io/stasis/cli/CliOptions.scala b/stasis-cli/src/main/scala/io/stasis/cli/CliOptions.scala
deleted file mode 100644
index 0175a48..0000000
--- a/stasis-cli/src/main/scala/io/stasis/cli/CliOptions.scala
+++ /dev/null
@@ -1,275 +0,0 @@
-package org.scalafmt.cli
-
-import java.io.{IOException, InputStream, PrintStream}
-import java.nio.charset.UnsupportedCharsetException
-import java.nio.file.{Files, Path}
-
-import com.typesafe.config.{ConfigException, ConfigFactory}
-import metaconfig.Configured
-import org.scalafmt.config.ScalafmtConfig
-import org.scalafmt.config.Config
-import org.scalafmt.util.{AbsoluteFile, FileOps, GitOps, GitOpsImpl, OsSpecific}
-
-import scala.io.Codec
-import scala.util.control.NonFatal
-import scala.util.matching.Regex
-import scala.util.control.Exception.catching
-
-object CliOptions {
-  val default = CliOptions()
-
-  /**
-    * Tries to read configuration from
-    *
-    * 1. .scalafmt.conf in root dir of current git repo
-    *     IF the following setting is enabled: project.git = true
-    * 2. .scalafmt.conf from init.commong.workingDirectory
-    *
-    * I am happy to add alternative fallback methods for other VCS.
-    *
-    * WARNING. Throws an exception if the .scalafmt.conf error exists but
-    * contains an error. Why? Because this method is only supposed to be
-    * called directly from main.
-    */
-  def auto(args: Array[String], init: CliOptions)(
-      parsed: CliOptions
-  ): CliOptions = {
-    val style: Option[Path] = if (init.config != parsed.config) {
-      parsed.config
-    } else {
-      tryCurrentDirectory(parsed).orElse(tryGit(parsed))
-    }
-    val newMode = if (parsed.testing) Stdout else parsed.writeMode
-    parsed.copy(
-      writeMode = newMode,
-      config = style
-    )
-  }
-
-  private def getConfigJFile(file: AbsoluteFile): AbsoluteFile =
-    file / ".scalafmt.conf"
-
-  private def tryDirectory(options: CliOptions)(dir: AbsoluteFile): Path =
-    getConfigJFile(dir).jfile.toPath
-
-  private def tryGit(options: CliOptions): Option[Path] = {
-    for {
-      rootDir <- options.gitOps.rootDir
-      path = tryDirectory(options)(rootDir)
-      configFilePath <- if (path.toFile.isFile) Some(path) else None
-    } yield configFilePath
-  }
-
-  private def tryCurrentDirectory(options: CliOptions): Option[Path] = {
-    val configFilePath = tryDirectory(options)(options.common.workingDirectory)
-    if (configFilePath.toFile.isFile) Some(configFilePath) else None
-  }
-}
-
-case class CommonOptions(
-    workingDirectory: AbsoluteFile = AbsoluteFile.userDir,
-    out: PrintStream = System.out,
-    in: InputStream = System.in,
-    err: PrintStream = System.err
-)
-
-case class CliOptions(
-    config: Option[Path] = None,
-    configStr: Option[String] = None,
-    range: Set[Range] = Set.empty[Range],
-    customFiles: Seq[AbsoluteFile] = Nil,
-    customExcludes: Seq[String] = Nil,
-    writeMode: WriteMode = Override,
-    testing: Boolean = false,
-    stdIn: Boolean = false,
-    quiet: Boolean = false,
-    debug: Boolean = false,
-    git: Option[Boolean] = None,
-    nonInteractive: Boolean = false,
-    mode: Option[FileFetchMode] = None,
-    diff: Option[String] = None,
-    assumeFilename: String = "stdin.scala", // used when read from stdin
-    migrate: Option[AbsoluteFile] = None,
-    common: CommonOptions = CommonOptions(),
-    gitOpsConstructor: AbsoluteFile => GitOps = x => new GitOpsImpl(x),
-    noStdErr: Boolean = false
-) {
-  // These default values are copied from here.
-  // https://github.com/scalameta/scalafmt/blob/f2154330afa0bc4a0a556598adeb116eafecb8e3/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala#L127-L162
-  private[this] val DefaultGit = false
-  private[this] val DefaultFatalWarnings = false
-  private[this] val DefaultIgnoreWarnings = false
-  private[this] val DefaultEncoding = Codec.UTF8
-
-  /** Create a temporary file that contains configuration string specified by `--config-str`.
-    * This temporary file will be passed to `scalafmt-dynamic`.
-    * See https://github.com/scalameta/scalafmt/pull/1367#issuecomment-464744077
-    */
-  private[this] val tempConfigPath: Option[Path] = configStr.map { s =>
-    val file = Files.createTempFile(".scalafmt", ".conf")
-    Files.write(file, s.getBytes)
-    file
-  }
-
-  /** - If --config-str is specified (and tempConfigPath is defined),
-    *   this returns the path to a temporary file.
-    * - If both tempConfigPath and config are None,
-    *   this return the path to `.scalafmt.conf` on the working directory.
-    *
-    * @return A path to a configuration file
-    */
-  def configPath: Path = tempConfigPath match {
-    case Some(tempConf) => tempConf
-    case None =>
-      config.getOrElse(
-        (common.workingDirectory / ".scalafmt.conf").jfile.toPath
-      )
-  }
-
-  /** Parse the scalafmt configuration and try to encode it to `ScalafmtConfig`.
-    * If `--config-str` is specified, this will parse the configuration string specified by `--config-str`.
-    * Otherwise, a contents of configuration file specified by `configPath` will be parsed.
-    *
-    * If `--config-str` is not specified and configuration file is missing, this will return the default configuration
-    */
-  def scalafmtConfig: Configured[ScalafmtConfig] = {
-    (configStr match {
-      case Some(contents) => Some(contents)
-      case None =>
-        val file =
-          AbsoluteFile.fromFile(configPath.toFile, common.workingDirectory)
-        catching(classOf[IOException]).opt(FileOps.readFile(file))
-    }).map { content =>
-        Config.fromHoconString(content)
-      }
-      .getOrElse(Configured.Ok(ScalafmtConfig.default))
-  }
-
-  val inPlace: Boolean = writeMode == Override
-
-  val fileFetchMode: FileFetchMode =
-    mode.orElse(Some(GitFiles).filter(_ => isGit)).getOrElse(RecursiveSearch)
-
-  val files: Seq[AbsoluteFile] =
-    if (customFiles.isEmpty)
-      Seq(common.workingDirectory)
-    else
-      customFiles
-
-  val gitOps: GitOps = gitOpsConstructor(common.workingDirectory)
-  /*
-  def withProject(projectFiles: ProjectFiles): CliOptions = {
-    this.copy(config = config.copy(project = projectFiles))
-  }
-   */
-
-  def withFiles(files: Seq[AbsoluteFile]): CliOptions = {
-    this.copy(customFiles = files)
-  }
-
-  def info: PrintStream = {
-    if (noStdErr || (!stdIn && writeMode != Stdout)) common.out else common.err
-  }
-
-  def excludeFilterRegexp: Regex =
-    mkRegexp(customExcludes.map(OsSpecific.fixSeparatorsInPathPattern))
-
-  private def mkRegexp(filters: Seq[String], strict: Boolean = false): Regex =
-    filters match {
-      case Nil => "$a".r // will never match anything
-      case head :: Nil => head.r
-      case _ if strict => filters.mkString("^(", "|", ")$").r
-      case _ => filters.mkString("(", "|", ")").r
-    }
-
-  private[cli] def isGit: Boolean = readGit(configPath).getOrElse(DefaultGit)
-
-  private[cli] def fatalWarnings: Boolean =
-    readFatalWarnings(configPath).getOrElse(DefaultFatalWarnings)
-
-  private[cli] def ignoreWarnings: Boolean =
-    readIgnoreWarnings(configPath).getOrElse(DefaultIgnoreWarnings)
-
-  private[cli] def onTestFailure: Option[String] = readOnTestFailure(configPath)
-
-  private[cli] def encoding: Codec =
-    readEncoding(configPath).getOrElse(DefaultEncoding)
-
-  /** Returns None if .scalafmt.conf is not found or
-    * version setting is missing.
-    */
-  private[cli] def version: Option[String] =
-    readVersion(configPath)
-
-  private def readGit(config: Path): Option[Boolean] = {
-    try {
-      Some(
-        ConfigFactory
-          .parseFile(config.toFile)
-          .getConfig("project")
-          .getBoolean("git")
-      )
-    } catch {
-      case _: ConfigException.Missing => None
-      case NonFatal(_) => None
-    }
-  }
-
-  private def readOnTestFailure(config: Path): Option[String] = {
-    try {
-      Some(ConfigFactory.parseFile(config.toFile).getString("onTestFailure"))
-    } catch {
-      case _: ConfigException.Missing => None
-      case NonFatal(_) => None
-    }
-  }
-
-  private def readFatalWarnings(config: Path): Option[Boolean] = {
-    try {
-      Some(
-        ConfigFactory
-          .parseFile(config.toFile)
-          .getConfig("runner")
-          .getBoolean("fatalWarnings")
-      )
-    } catch {
-      case _: ConfigException.Missing => None
-      case NonFatal(_) => None
-    }
-  }
-
-  private def readIgnoreWarnings(config: Path): Option[Boolean] = {
-    try {
-      Some(
-        ConfigFactory
-          .parseFile(config.toFile)
-          .atPath("runner")
-          .getBoolean("ignoreWarnings")
-      )
-    } catch {
-      case _: ConfigException.Missing => None
-      case NonFatal(_) => None
-    }
-  }
-
-  private def readEncoding(config: Path): Option[Codec] = {
-    try {
-      val codecStr =
-        ConfigFactory.parseFile(config.toFile).getString("encoding")
-      Some(Codec.apply(codecStr))
-    } catch {
-      case _: ConfigException.Missing => None
-      case _: UnsupportedCharsetException => None
-      case NonFatal(_) => None
-    }
-  }
-
-  private def readVersion(config: Path): Option[String] = {
-    try {
-      Some(ConfigFactory.parseFile(config.toFile).getString("version"))
-    } catch {
-      case _: ConfigException.Missing => None
-      case NonFatal(_) => None
-    }
-  }
-}
diff --git a/stasis-cli/src/main/scala/io/stasis/cli/ExitCode.scala b/stasis-cli/src/main/scala/io/stasis/cli/ExitCode.scala
deleted file mode 100644
index 77d0e2c..0000000
--- a/stasis-cli/src/main/scala/io/stasis/cli/ExitCode.scala
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.scalafmt.cli
-
-import scala.collection.mutable
-
-sealed abstract case class ExitCode(code: Int, name: String) {
-  def isOk: Boolean = this == ExitCode.Ok
-  def is(c: ExitCode): Boolean =
-    (code & c.code) != 0
-  override def toString: String = s"$name=$code"
-}
-
-object ExitCode {
-  // NOTE: ExitCode resembles an Enumeration very much, but has minor differences
-  // for example how the name is calculated for merged exit codes.
-  private var counter = 0
-  private val allInternal = mutable.ListBuffer.empty[ExitCode]
-  private val cache =
-    new java.util.concurrent.ConcurrentHashMap[Int, ExitCode]
-  private def generateExitStatus(implicit name: sourcecode.Name) = {
-    val code = counter
-    counter = if (counter == 0) 1 else counter << 1
-    val result = new ExitCode(code, name.value) {}
-    allInternal += result
-    result
-  }
-  // see https://github.com/scalameta/scalafmt/issues/941
-  // format: off
-  val Ok,
-      TestError,
-      ParseError,
-      CommandLineArgumentError,
-      UnexpectedError
-    : ExitCode = generateExitStatus
-  // format: on
-  lazy val all: List[ExitCode] = allInternal.toList
-  private def codeToName(code: Int): String = {
-    if (code == 0) Ok.name
-    else {
-      val names = all.collect {
-        case exit if (exit.code & code) != 0 => exit.name
-      }
-      names.mkString("+")
-    }
-  }
-  def apply(code: Int): ExitCode = {
-    if (cache.contains(code)) cache.get(code)
-    else {
-      val result = new ExitCode(code, codeToName(code)) {}
-      cache.put(code, result)
-      result
-    }
-  }
-
-  def merge(exit1: ExitCode, exit2: ExitCode): ExitCode =
-    apply(exit1.code | exit2.code)
-}
diff --git a/stasis-cli/src/main/scala/io/stasis/cli/TermDisplay.scala b/stasis-cli/src/main/scala/io/stasis/cli/TermDisplay.scala
deleted file mode 100644
index 130c51a..0000000
--- a/stasis-cli/src/main/scala/io/stasis/cli/TermDisplay.scala
+++ /dev/null
@@ -1,532 +0,0 @@
-package org.scalafmt.cli
-
-/**
-  * This code is copy/pasted from (Apache 2 licence)
-  * https://github.com/alexarchambault/coursier/blob/51fefe5c29d95752ce487f60d333b1f8a91dd1b0/cache/src/main/scala/coursier/TermDisplay.scala
-  *
-  * which in turn was copy/pasted from (MIT licence)
-  * https://github.com/lihaoyi/Ammonite/blob/10854e3b8b454a74198058ba258734a17af32023/terminal/src/main/scala/ammonite/terminal/Utils.scala
-  */
-import scala.annotation.tailrec
-import scala.collection.mutable.ArrayBuffer
-import scala.util.Try
-
-import java.io.File
-import java.io.Writer
-import java.sql.Timestamp
-import java.util.concurrent._
-
-object Terminal {
-
-  private lazy val pathedTput =
-    if (new File("/usr/bin/tput").exists()) "/usr/bin/tput" else "tput"
-
-  def consoleDim(s: String): Option[Int] =
-    if (new File("/dev/tty").exists()) {
-      import sys.process._
-      val nullLog = new ProcessLogger {
-        def out(s: => String): Unit = {}
-        def err(s: => String): Unit = {}
-        def buffer[T](f: => T): T = f
-      }
-      Try(
-        Process(Seq("bash", "-c", s"$pathedTput $s 2> /dev/tty"))
-          .!!(nullLog)
-          .trim
-          .toInt
-      ).toOption
-    } else
-      None
-
-  implicit class Ansi(val output: Writer) extends AnyVal {
-    private def control(n: Int, c: Char) = output.write(s"\033[" + n + c)
-
-    /**
-      * Move up `n` squares
-      */
-    def up(n: Int): Unit = if (n > 0) control(n, 'A')
-
-    /**
-      * Move down `n` squares
-      */
-    def down(n: Int): Unit = if (n > 0) control(n, 'B')
-
-    /**
-      * Move left `n` squares
-      */
-    def left(n: Int): Unit = if (n > 0) control(n, 'D')
-
-    /**
-      * Clear the current line
-      *
-      * n=0: clear from cursor to end of line
-      * n=1: clear from cursor to start of line
-      * n=2: clear entire line
-      */
-    def clearLine(n: Int): Unit = control(n, 'K')
-  }
-
-}
-
-object TermDisplay {
-
-  def defaultFallbackMode: Boolean = {
-    val env0 = sys.env.get("COURSIER_PROGRESS").map(_.toLowerCase).collect {
-      case "true" | "enable" | "1" => true
-      case "false" | "disable" | "0" => false
-    }
-    def compatibilityEnv = sys.env.get("COURSIER_NO_TERM").nonEmpty
-
-    def nonInteractive = System.console() == null
-
-    def insideEmacs = sys.env.contains("INSIDE_EMACS")
-    def ci = sys.env.contains("CI")
-
-    val env = env0.getOrElse(compatibilityEnv)
-
-    env || nonInteractive || insideEmacs || ci
-  }
-
-  private sealed abstract class Info extends Product with Serializable {
-    def fraction: Option[Double]
-    def display(): String
-  }
-
-  private case class DownloadInfo(
-      downloaded: Long,
-      previouslyDownloaded: Long,
-      length: Option[Long],
-      startTime: Long,
-      updateCheck: Boolean
-  ) extends Info {
-
-    /** 0.0 to 1.0 */
-    def fraction: Option[Double] = length.map(downloaded.toDouble / _)
-
-    /** Byte / s */
-    def rate(): Option[Double] = {
-      val currentTime = System.currentTimeMillis()
-      if (currentTime > startTime)
-        Some(
-          (downloaded - previouslyDownloaded).toDouble /
-            (System.currentTimeMillis() - startTime) * 1000.0
-        )
-      else
-        None
-    }
-
-    // Scala version of http://stackoverflow.com/questions/3758606/how-to-convert-byte-size-into-human-readable-format-in-java/3758880#3758880
-    private def byteCount(bytes: Long, si: Boolean = false): String = {
-      val unit = if (si) 1000 else 1024
-      if (bytes < unit)
-        bytes + " B"
-      else {
-        val exp = (math.log(bytes) / math.log(unit)).toInt
-        val pre =
-          (if (si) "kMGTPE"
-           else "KMGTPE").charAt(exp - 1) +
-            (if (si) ""
-             else "i")
-        f"${bytes / math.pow(unit, exp)}%.1f ${pre}B"
-      }
-    }
-
-    def display(): String = {
-      val decile = (10.0 * fraction.getOrElse(0.0)).toInt
-      assert(decile >= 0)
-      assert(decile <= 10)
-
-      fraction.fold(" " * 6)(p => f"${100.0 * p}%5.1f%%") +
-        " [" + ("#" * decile) + (" " * (10 - decile)) + "] " +
-        downloaded + " source files formatted"
-    }
-  }
-
-  private val format = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
-  private def formatTimestamp(ts: Long): String =
-    format.format(new Timestamp(ts))
-
-  private case class CheckUpdateInfo(
-      currentTimeOpt: Option[Long],
-      remoteTimeOpt: Option[Long],
-      isDone: Boolean
-  ) extends Info {
-    def fraction = None
-    def display(): String = {
-      if (isDone)
-        (currentTimeOpt, remoteTimeOpt) match {
-          case (Some(current), Some(remote)) =>
-            if (current < remote)
-              s"Updated since ${formatTimestamp(current)} (${formatTimestamp(remote)})"
-            else if (current == remote)
-              s"No new update since ${formatTimestamp(current)}"
-            else
-              s"Warning: local copy newer than remote one (${formatTimestamp(current)} > ${formatTimestamp(remote)})"
-          case (Some(_), None) =>
-            // FIXME Likely a 404 Not found, that should be taken into account by the cache
-            "No modified time in response"
-          case (None, Some(remote)) =>
-            s"Last update: ${formatTimestamp(remote)}"
-          case (None, None) =>
-            "" // ???
-        } else
-        currentTimeOpt match {
-          case Some(current) =>
-            s"Checking for updates since ${formatTimestamp(current)}"
-          case None =>
-            "" // ???
-        }
-    }
-  }
-
-  private sealed abstract class Message extends Product with Serializable
-  private object Message {
-    case object Update extends Message
-    case object Stop extends Message
-  }
-
-  private val refreshInterval = 1000 / 60
-  private val fallbackRefreshInterval = 1000
-
-  private class UpdateDisplayThread(
-      out: Writer,
-      var fallbackMode: Boolean
-  ) extends Thread("TermDisplay") {
-
-    import Terminal.Ansi
-
-    setDaemon(true)
-
-    private var width = 80
-    private var currentHeight = 0
-
-    private val q = new LinkedBlockingDeque[Message]
-
-    def update(): Unit = {
-      if (q.size() == 0)
-        q.put(Message.Update)
-    }
-
-    def end(): Unit = {
-      q.put(Message.Stop)
-      join()
-    }
-
-    private val downloads = new ArrayBuffer[String]
-    private val doneQueue = new ArrayBuffer[(String, Info)]
-    val infos = new ConcurrentHashMap[String, Info]
-
-    def newEntry(
-        url: String,
-        info: Info,
-        fallbackMessage: => String
-    ): Unit = {
-      assert(!infos.containsKey(url))
-      val prev = infos.putIfAbsent(url, info)
-      assert(prev == null)
-
-      if (fallbackMode) {
-        // FIXME What about concurrent accesses to out from the thread above?
-        out.write(fallbackMessage)
-        out.flush()
-      }
-
-      downloads.synchronized {
-        downloads.append(url)
-      }
-
-      update()
-    }
-
-    def removeEntry(
-        url: String,
-        success: Boolean,
-        fallbackMessage: => String
-    )(
-        update0: Info => Info
-    ): Unit = {
-      downloads.synchronized {
-        downloads -= url
-
-        val info = infos.remove(url)
-
-        if (success)
-          doneQueue += (url -> update0(info))
-      }
-
-      if (fallbackMode && success) {
-        // FIXME What about concurrent accesses to out from the thread above?
-        out.write(fallbackMessage)
-        out.flush()
-      }
-
-      update()
-    }
-
-    private def reflowed(url: String, info: Info) = {
-      val extra = info match {
-        case downloadInfo: DownloadInfo =>
-          val pctOpt = downloadInfo.fraction.map(100.0 * _)
-
-          if (downloadInfo.length.isEmpty && downloadInfo.downloaded == 0L)
-            ""
-          else {
-            val pctOptStr =
-              pctOpt.map(pct => f"$pct%.2f %%, ").toIterable.mkString
-            val downloadInfoStr = downloadInfo.length.map(" / " + _).mkString
-            s"($pctOptStr${downloadInfo.downloaded}$downloadInfoStr)"
-          }
-
-        case updateInfo: CheckUpdateInfo =>
-          "Checking for updates"
-      }
-
-      val baseExtraWidth = width / 5
-
-      val total = url.length + 1 + extra.length
-      val (url0, extra0) =
-        if (total >= width) { // or > ? If equal, does it go down 2 lines?
-          val overflow = total - width + 1
-
-          val extra0 =
-            if (extra.length > baseExtraWidth)
-              extra.take((baseExtraWidth max (extra.length - overflow)) - 1) + "…"
-            else
-              extra
-
-          val total0 = url.length + 1 + extra0.length
-          val overflow0 = total0 - width + 1
-
-          val url0 =
-            if (total0 >= width)
-              url.take(
-                ((width - baseExtraWidth - 1) max (url.length - overflow0)) - 1
-              ) + "…"
-            else
-              url
-
-          (url0, extra0)
-        } else
-          (url, extra)
-
-      (url0, extra0)
-    }
-
-    private def truncatedPrintln(s: String): Unit = {
-
-      out.clearLine(2)
-
-      if (s.length <= width)
-        out.write(s + "\n")
-      else
-        out.write(s.take(width - 1) + "…\n")
-    }
-
-    @tailrec private def updateDisplayLoop(lineCount: Int): Unit = {
-      currentHeight = lineCount
-
-      Option(q.poll(100L, TimeUnit.MILLISECONDS)) match {
-        case None => updateDisplayLoop(lineCount)
-        case Some(Message.Stop) => // poison pill
-        case Some(Message.Update) =>
-          val (done0, downloads0) = downloads.synchronized {
-            val q = doneQueue.toVector
-              .filter {
-                case (url, _) =>
-                  !url.endsWith(".sha1") && !url.endsWith(".md5")
-              }
-              .sortBy { case (url, _) => url }
-
-            doneQueue.clear()
-
-            val dw = downloads.toVector
-              .map { url =>
-                url -> infos.get(url)
-              }
-              .sortBy { case (_, info) => -info.fraction.sum }
-
-            (q, dw)
-          }
-
-          for ((url, info) <- done0 ++ downloads0) {
-            assert(info != null, s"Incoherent state ($url)")
-
-            truncatedPrintln(url)
-            out.clearLine(2)
-            out.write(s"  ${info.display()}\n")
-          }
-
-          val displayedCount = (done0 ++ downloads0).length
-
-          if (displayedCount < lineCount) {
-            for (_ <- 1 to 2; _ <- displayedCount until lineCount) {
-              out.clearLine(2)
-              out.down(1)
-            }
-
-            for (_ <- displayedCount until lineCount)
-              out.up(2)
-          }
-
-          for (_ <- downloads0.indices)
-            out.up(2)
-
-          out.left(10000)
-
-          out.flush()
-          Thread.sleep(refreshInterval)
-          updateDisplayLoop(downloads0.length)
-      }
-    }
-
-    @tailrec private def fallbackDisplayLoop(previous: Set[String]): Unit =
-      Option(q.poll(100L, TimeUnit.MILLISECONDS)) match {
-        case None => fallbackDisplayLoop(previous)
-        case Some(Message.Stop) => // poison pill
-
-          // clean up display
-          for (_ <- 1 to 2; _ <- 0 until currentHeight) {
-            out.clearLine(2)
-            out.down(1)
-          }
-          for (_ <- 0 until currentHeight) {
-            out.up(2)
-          }
-
-        case Some(Message.Update) =>
-          val downloads0 = downloads.synchronized {
-            downloads.toVector
-              .map { url =>
-                url -> infos.get(url)
-              }
-              .sortBy { case (_, info) => -info.fraction.sum }
-          }
-
-          var displayedSomething = false
-          for ((url, info) <- downloads0 if previous(url)) {
-            assert(info != null, s"Incoherent state ($url)")
-
-            val (url0, extra0) = reflowed(url, info)
-
-            displayedSomething = true
-            out.write(s"$url0 $extra0\n")
-          }
-
-          if (displayedSomething)
-            out.write("\n")
-
-          out.flush()
-          Thread.sleep(fallbackRefreshInterval)
-          fallbackDisplayLoop(previous ++ downloads0.map {
-            case (url, _) => url
-          })
-      }
-
-    override def run(): Unit = {
-
-      Terminal.consoleDim("cols") match {
-        case Some(cols) =>
-          width = cols
-          out.clearLine(2)
-        case None =>
-          fallbackMode = true
-      }
-
-      if (fallbackMode)
-        fallbackDisplayLoop(Set.empty)
-      else
-        updateDisplayLoop(0)
-    }
-  }
-
-}
-
-object Cache {
-  trait Logger {
-    def foundLocally(url: String, f: File): Unit = {}
-    def startTask(url: String, file: File): Unit = {}
-    def taskProgress(url: String, downloaded: Long): Unit = {}
-    def completedTask(url: String, success: Boolean): Unit = {}
-    def checkingUpdates(url: String, currentTimeOpt: Option[Long]): Unit = {}
-  }
-}
-
-class TermDisplay(
-    out: Writer,
-    val fallbackMode: Boolean = TermDisplay.defaultFallbackMode
-) extends Cache.Logger {
-
-  import TermDisplay._
-
-  private val updateThread = new UpdateDisplayThread(out, fallbackMode)
-
-  def init(): Unit = {
-    updateThread.start()
-  }
-
-  def stop(): Unit = {
-    updateThread.end()
-  }
-
-  override def startTask(msg: String, file: File): Unit =
-    updateThread.newEntry(
-      msg,
-      DownloadInfo(
-        0L,
-        0L,
-        None,
-        System.currentTimeMillis(),
-        updateCheck = false
-      ),
-      s"$msg\n"
-    )
-
-  def taskLength(
-      url: String,
-      totalLength: Long,
-      alreadyDownloaded: Long
-  ): Unit = {
-    val info = updateThread.infos.get(url)
-    assert(info != null)
-    val newInfo = info match {
-      case info0: DownloadInfo =>
-        info0.copy(
-          length = Some(totalLength),
-          previouslyDownloaded = alreadyDownloaded
-        )
-      case _ =>
-        throw new Exception(s"Incoherent display state for $url")
-    }
-    updateThread.infos.put(url, newInfo)
-
-    updateThread.update()
-  }
-  override def taskProgress(url: String, downloaded: Long): Unit = {
-    val info = updateThread.infos.get(url)
-    if (info != null) { // We might not want the progress bar.
-      val newInfo = info match {
-        case info0: DownloadInfo =>
-          info0.copy(downloaded = downloaded)
-        case _ =>
-          throw new Exception(s"Incoherent display state for $url")
-      }
-      updateThread.infos.put(url, newInfo)
-
-      updateThread.update()
-    }
-  }
-
-  override def completedTask(url: String, success: Boolean): Unit =
-    updateThread.removeEntry(url, success, s"$url\n")(x => x)
-
-  override def checkingUpdates(
-      url: String,
-      currentTimeOpt: Option[Long]
-  ): Unit =
-    updateThread.newEntry(
-      url,
-      CheckUpdateInfo(currentTimeOpt, None, isDone = false),
-      s"$url\n"
-    )
-
-}
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/ByteArrayBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/ByteArrayBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/ByteArrayBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/ByteArrayBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/EntityBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/EntityBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/EntityBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/EntityBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/EntryBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/EntryBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/EntryBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/EntryBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/RecordNumberBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/RecordNumberBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/RecordNumberBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/RecordNumberBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/package.html b/stasis-core/src/main/java/com/sleepycat/bind/package.html
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/package.html
rename to stasis-core/src/main/java/com/sleepycat/bind/package.html
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/ClassCatalog.java b/stasis-core/src/main/java/com/sleepycat/bind/serial/ClassCatalog.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/ClassCatalog.java
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/ClassCatalog.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/SerialBase.java b/stasis-core/src/main/java/com/sleepycat/bind/serial/SerialBase.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/SerialBase.java
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/SerialBase.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/SerialBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/serial/SerialBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/SerialBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/SerialBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/SerialInput.java b/stasis-core/src/main/java/com/sleepycat/bind/serial/SerialInput.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/SerialInput.java
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/SerialInput.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/SerialOutput.java b/stasis-core/src/main/java/com/sleepycat/bind/serial/SerialOutput.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/SerialOutput.java
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/SerialOutput.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/SerialSerialBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/serial/SerialSerialBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/SerialSerialBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/SerialSerialBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/SerialSerialKeyCreator.java b/stasis-core/src/main/java/com/sleepycat/bind/serial/SerialSerialKeyCreator.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/SerialSerialKeyCreator.java
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/SerialSerialKeyCreator.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/StoredClassCatalog.java b/stasis-core/src/main/java/com/sleepycat/bind/serial/StoredClassCatalog.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/StoredClassCatalog.java
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/StoredClassCatalog.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/TupleSerialBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/serial/TupleSerialBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/TupleSerialBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/TupleSerialBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/TupleSerialKeyCreator.java b/stasis-core/src/main/java/com/sleepycat/bind/serial/TupleSerialKeyCreator.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/TupleSerialKeyCreator.java
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/TupleSerialKeyCreator.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.java b/stasis-core/src/main/java/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.java
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/serial/package.html b/stasis-core/src/main/java/com/sleepycat/bind/serial/package.html
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/serial/package.html
rename to stasis-core/src/main/java/com/sleepycat/bind/serial/package.html
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/BigDecimalBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/BigDecimalBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/BigDecimalBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/BigDecimalBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/BigIntegerBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/BigIntegerBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/BigIntegerBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/BigIntegerBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/BooleanBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/BooleanBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/BooleanBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/BooleanBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/ByteBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/ByteBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/ByteBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/ByteBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/CharacterBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/CharacterBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/CharacterBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/CharacterBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/DoubleBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/DoubleBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/DoubleBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/DoubleBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/FloatBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/FloatBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/FloatBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/FloatBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/IntegerBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/IntegerBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/IntegerBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/IntegerBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/LongBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/LongBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/LongBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/LongBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/MarshalledTupleEntry.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/MarshalledTupleEntry.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/MarshalledTupleEntry.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/MarshalledTupleEntry.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/PackedIntegerBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/PackedIntegerBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/PackedIntegerBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/PackedIntegerBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/PackedLongBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/PackedLongBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/PackedLongBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/PackedLongBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/ShortBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/ShortBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/ShortBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/ShortBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/SortedBigDecimalBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/SortedBigDecimalBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/SortedBigDecimalBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/SortedBigDecimalBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/SortedDoubleBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/SortedDoubleBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/SortedDoubleBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/SortedDoubleBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/SortedFloatBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/SortedFloatBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/SortedFloatBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/SortedFloatBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/SortedPackedIntegerBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/SortedPackedIntegerBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/SortedPackedIntegerBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/SortedPackedIntegerBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/SortedPackedLongBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/SortedPackedLongBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/SortedPackedLongBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/SortedPackedLongBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/StringBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/StringBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/StringBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/StringBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleBase.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleBase.java
similarity index 99%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleBase.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleBase.java
index d925486..c775464 100644
--- a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleBase.java
+++ b/stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleBase.java
@@ -148,6 +148,7 @@ public class TupleBase<E> {
      *
      * @deprecated replaced by {@link #getTupleOutput}
      */
+    @Deprecated
     public static TupleOutput newOutput() {
 
         return new TupleOutput();
@@ -163,6 +164,7 @@ public class TupleBase<E> {
      *
      * @deprecated replaced by {@link #getTupleOutput}
      */
+    @Deprecated
     public static TupleOutput newOutput(byte[] buffer) {
 
         return new TupleOutput(buffer);
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleInput.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleInput.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleInput.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleInput.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleInputBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleInputBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleInputBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleInputBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleMarshalledBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleMarshalledBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleMarshalledBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleMarshalledBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleOutput.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleOutput.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleOutput.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleOutput.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleTupleBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleTupleBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleTupleBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleTupleBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleTupleKeyCreator.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleTupleKeyCreator.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleTupleKeyCreator.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleTupleKeyCreator.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.java b/stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.java
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.java
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.java
diff --git a/stasis-persist/src/main/java/com/sleepycat/bind/tuple/package.html b/stasis-core/src/main/java/com/sleepycat/bind/tuple/package.html
similarity index 100%
rename from stasis-persist/src/main/java/com/sleepycat/bind/tuple/package.html
rename to stasis-core/src/main/java/com/sleepycat/bind/tuple/package.html
diff --git a/stasis-core/src/main/java/com/sleepycat/je/BtreeStats.java b/stasis-core/src/main/java/com/sleepycat/je/BtreeStats.java
index c8df042..7eda6bf 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/BtreeStats.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/BtreeStats.java
@@ -76,6 +76,7 @@ public class BtreeStats extends DatabaseStats {
     /**
      * @deprecated as of 5.0, returns zero.
      */
+    @Deprecated
     public long getDuplicateBottomInternalNodeCount() {
         return 0;
     }
@@ -99,6 +100,7 @@ public class BtreeStats extends DatabaseStats {
     /**
      * @deprecated as of 5.0, returns zero.
      */
+    @Deprecated
     public long getDupCountLeafNodeCount() {
         return 0;
     }
@@ -120,6 +122,7 @@ public class BtreeStats extends DatabaseStats {
     /**
      * @deprecated as of 5.0, returns zero.
      */
+    @Deprecated
     public long getDuplicateInternalNodeCount() {
         return 0;
     }
@@ -161,6 +164,7 @@ public class BtreeStats extends DatabaseStats {
     /**
      * @deprecated as of 5.0, returns zero.
      */
+    @Deprecated
     public int getDuplicateTreeMaxDepth() {
         return 0;
     }
@@ -216,6 +220,7 @@ public class BtreeStats extends DatabaseStats {
     /**
      * @deprecated as of 5.0, returns an empty array.
      */
+    @Deprecated
     public long[] getDINsByLevel() {
         return new long[0];
     }
@@ -223,6 +228,7 @@ public class BtreeStats extends DatabaseStats {
     /**
      * @deprecated as of 5.0, returns an empty array.
      */
+    @Deprecated
     public long[] getDBINsByLevel() {
         return new long[0];
     }
diff --git a/stasis-core/src/main/java/com/sleepycat/je/CacheMode.java b/stasis-core/src/main/java/com/sleepycat/je/CacheMode.java
index 156cd79..d2bf213 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/CacheMode.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/CacheMode.java
@@ -173,6 +173,7 @@ public enum CacheMode {
      * @deprecated please use {@link #DEFAULT} instead. As of JE 4.0, this mode
      * functions exactly as if {@link #DEFAULT} were specified.
      */
+    @Deprecated
     KEEP_HOT,
 
     /**
@@ -247,6 +248,7 @@ public enum CacheMode {
      * @deprecated please use {@link #UNCHANGED} instead. As of JE 4.0, this
      * mode functions exactly as if {@link #UNCHANGED} were specified.
      */
+    @Deprecated
     MAKE_COLD,
 
     /**
diff --git a/stasis-core/src/main/java/com/sleepycat/je/Database.java b/stasis-core/src/main/java/com/sleepycat/je/Database.java
index 6863848..562a501 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/Database.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/Database.java
@@ -1000,6 +1000,7 @@ public class Database implements Closeable {
      * @deprecated in favor of {@link #populateSecondaries(Transaction,
      * DatabaseEntry, DatabaseEntry, long, CacheMode)}.
      */
+    @Deprecated
     public void populateSecondaries(final Transaction txn,
                                     final DatabaseEntry key,
                                     final DatabaseEntry data) {
@@ -1868,6 +1869,7 @@ public class Database implements Closeable {
      *
      * @throws IllegalStateException if the database has been closed.
      */
+    @Deprecated
     public void preload(final long maxBytes) {
         checkEnv();
         final DatabaseImpl dbImpl = checkOpen();
@@ -1908,6 +1910,7 @@ public class Database implements Closeable {
      *
      * @throws IllegalStateException if the database has been closed.
      */
+    @Deprecated
     public void preload(final long maxBytes, final long maxMillisecs) {
         checkEnv();
         final DatabaseImpl dbImpl = checkOpen();
diff --git a/stasis-core/src/main/java/com/sleepycat/je/DatabaseConfig.java b/stasis-core/src/main/java/com/sleepycat/je/DatabaseConfig.java
index 58660d8..a41bf1b 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/DatabaseConfig.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/DatabaseConfig.java
@@ -437,6 +437,7 @@ public class DatabaseConfig implements Cloneable {
      * @deprecated this property no longer has any effect; {@link
      * #setNodeMaxEntries} should be used instead.
      */
+    @Deprecated
     public DatabaseConfig setNodeMaxDupTreeEntries(int nodeMaxDupTreeEntries) {
         return this;
     }
@@ -464,6 +465,7 @@ public class DatabaseConfig implements Cloneable {
      * @deprecated this property no longer has any effect and zero is always
      * returned; {@link #getNodeMaxEntries} should be used instead.
      */
+    @Deprecated
     public int getNodeMaxDupTreeEntries() {
         return 0;
     }
@@ -1375,6 +1377,7 @@ public class DatabaseConfig implements Cloneable {
      * @deprecated As of JE 4.0.13, replaced by {@link
      * DatabaseConfig#clone()}.</p>
      */
+    @Deprecated
     public DatabaseConfig cloneConfig() {
         return clone();
     }
diff --git a/stasis-core/src/main/java/com/sleepycat/je/DbInternal.java b/stasis-core/src/main/java/com/sleepycat/je/DbInternal.java
index 7d7e349..4a10667 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/DbInternal.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/DbInternal.java
@@ -291,6 +291,7 @@ public class DbInternal {
     /**
      * @deprecated use new-style API below instead.
      */
+    @Deprecated
     public static OperationStatus search(
         final Cursor cursor,
         final DatabaseEntry key,
@@ -374,6 +375,7 @@ public class DbInternal {
     /**
      * @deprecated use new-style API below instead.
      */
+    @Deprecated
     public static OperationStatus searchBoth(
         final Cursor cursor,
         final DatabaseEntry key,
@@ -494,6 +496,7 @@ public class DbInternal {
     /**
      * @deprecated use {@link CursorConfig#setNonSticky} instead.
      */
+    @Deprecated
     public static void setNonCloning(final Cursor cursor,
                                      final boolean nonSticky) {
         cursor.setNonSticky(nonSticky);
diff --git a/stasis-core/src/main/java/com/sleepycat/je/DiskOrderedCursorConfig.java b/stasis-core/src/main/java/com/sleepycat/je/DiskOrderedCursorConfig.java
index 16918a2..e19418f 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/DiskOrderedCursorConfig.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/DiskOrderedCursorConfig.java
@@ -262,6 +262,7 @@ public class DiskOrderedCursorConfig implements Cloneable {
      * @deprecated this method has no effect and will be removed in a future
      * release.
      */
+    @Deprecated
     public DiskOrderedCursorConfig setMaxSeedMillisecs(
         final long maxSeedMillisecs) {
         return this;
@@ -278,6 +279,7 @@ public class DiskOrderedCursorConfig implements Cloneable {
      * @deprecated this method returns zero and will be removed in a future
      * release.
      */
+    @Deprecated
     public long getMaxSeedMillisecs() {
         return 0;
     }
@@ -286,6 +288,7 @@ public class DiskOrderedCursorConfig implements Cloneable {
      * @deprecated this method has no effect and will be removed in a future
      * release.
      */
+    @Deprecated
     public DiskOrderedCursorConfig setMaxSeedNodes(final long maxSeedNodes) {
         return this;
     }
@@ -301,6 +304,7 @@ public class DiskOrderedCursorConfig implements Cloneable {
      * @deprecated this method returns zero and will be removed in a future
      * release.
      */
+    @Deprecated
     public long getMaxSeedNodes() {
         return 0;
     }
diff --git a/stasis-core/src/main/java/com/sleepycat/je/Durability.java b/stasis-core/src/main/java/com/sleepycat/je/Durability.java
index 0f4b47f..2dbf088 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/Durability.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/Durability.java
@@ -78,6 +78,7 @@ public class Durability {
      *
      * @deprecated use {@link TransactionConfig#setReadOnly} instead.
      */
+    @Deprecated
     public static final Durability READ_ONLY_TXN =
         new Durability(SyncPolicy.NO_SYNC,      // localSync
                        SyncPolicy.NO_SYNC,      // replicaSync
diff --git a/stasis-core/src/main/java/com/sleepycat/je/Environment.java b/stasis-core/src/main/java/com/sleepycat/je/Environment.java
index 8bab31a..cba1424 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/Environment.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/Environment.java
@@ -2185,6 +2185,7 @@ public class Environment implements Closeable {
      * @deprecated as of 4.0.10, replaced by {@link
      * Environment#getStats(StatsConfig)}.</p>
      */
+    @Deprecated
     public LockStats getLockStats(StatsConfig config)
         throws DatabaseException {
 
diff --git a/stasis-core/src/main/java/com/sleepycat/je/EnvironmentConfig.java b/stasis-core/src/main/java/com/sleepycat/je/EnvironmentConfig.java
index 9e26015..7af13ed 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/EnvironmentConfig.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/EnvironmentConfig.java
@@ -1454,6 +1454,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * beyond that of a simple RAID configuration, and will be removed in the
      * next release, which is slated for mid-April, 2017.
      */
+    @Deprecated
     public static final String LOG_N_DATA_DIRECTORIES =
         "je.log.nDataDirectories";
 
@@ -1793,6 +1794,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * @deprecated NIO is no longer used by JE and this parameter has no
      * effect.
      */
+    @Deprecated
     public static final String LOG_USE_NIO = "je.log.useNIO";
 
     /**
@@ -1833,12 +1835,14 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * @deprecated NIO is no longer used by JE and this parameter has no
      * effect.
      */
+    @Deprecated
     public static final String LOG_DIRECT_NIO = "je.log.directNIO";
 
     /**
      * @deprecated NIO is no longer used by JE and this parameter has no
      * effect.
      */
+    @Deprecated
     public static final String LOG_CHUNKED_NIO = "je.log.chunkedNIO";
 
     /**
@@ -2165,6 +2169,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * @deprecated this property no longer has any effect; {@link
      * DatabaseConfig#setNodeMaxEntries} should be used instead.
      */
+    @Deprecated
     public static final String NODE_DUP_TREE_MAX_ENTRIES =
         "je.nodeDupTreeMaxEntries";
 
@@ -2245,6 +2250,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * @deprecated as of JE 6.0.  The {@link #TREE_BIN_DELTA} param alone now
      * determines whether a delta is logged.
      */
+    @Deprecated
     public static final String TREE_MAX_DELTA = "je.tree.maxDelta";
 
     /**
@@ -2461,6 +2467,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * any benefit and this feature has been removed.  This parameter has no
      * effect.
      */
+    @Deprecated
     public static final String COMPRESSOR_PURGE_ROOT =
         "je.compressor.purgeRoot";
 
@@ -2505,6 +2512,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * @deprecated as of JE 6.0. This parameter is ignored by the new, more
      * efficient and more accurate evictor.
      */
+    @Deprecated
     public static final String EVICTOR_NODES_PER_SCAN =
         "je.evictor.nodesPerScan";
 
@@ -2555,6 +2563,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * @deprecated as of JE 4.1, since the single evictor thread has
      * been replaced be a more robust thread pool.
      */
+    @Deprecated
     public static final String EVICTOR_DEADLOCK_RETRY =
         "je.evictor.deadlockRetry";
 
@@ -2562,6 +2571,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * @deprecated  as of JE 6.0. This parameter is ignored by the new,
      * more efficient and more accurate evictor.
      */
+    @Deprecated
     public static final String EVICTOR_LRU_ONLY = "je.evictor.lruOnly";
 
     /**
@@ -3131,6 +3141,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * @deprecated in JE 6.3. Adjustments are no longer needed because LN log
      * sizes have been stored in the Btree since JE 6.0.
      */
+    @Deprecated
     public static final String CLEANER_ADJUST_UTILIZATION =
         "je.cleaner.adjustUtilization";
 
@@ -3283,6 +3294,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * @deprecated in 7.0. No longer used because the cleaner no longer has a
      * backlog.
      */
+    @Deprecated
     public static final String CLEANER_MAX_BATCH_FILES =
         "je.cleaner.maxBatchFiles";
 
@@ -3416,6 +3428,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * longer supported due to its negative impact on eviction and Btree
      * splits. To reduce a cleaner backlog, configure more cleaner threads.
      */
+    @Deprecated
     public static final String CLEANER_FOREGROUND_PROACTIVE_MIGRATION =
         "je.cleaner.foregroundProactiveMigration";
 
@@ -3425,6 +3438,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * checkpointing. To reduce a cleaner backlog, configure more cleaner
      * threads.
      */
+    @Deprecated
     public static final String CLEANER_BACKGROUND_PROACTIVE_MIGRATION =
         "je.cleaner.backgroundProactiveMigration";
 
@@ -3433,6 +3447,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * supported due to its negative impact on eviction and checkpointing.
      * To reduce a cleaner backlog, configure more cleaner threads.
      */
+    @Deprecated
     public static final String CLEANER_LAZY_MIGRATION =
         "je.cleaner.lazyMigration";
 
@@ -3613,6 +3628,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      *
      * @deprecated since JE 6.5; has no effect, as if it were set to false.
      */
+    @Deprecated
     public static final String LOCK_OLD_LOCK_EXCEPTIONS =
         "je.lock.oldLockExceptions";
 
@@ -3728,6 +3744,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * set "com.sleepycat.je.util.FileHandler.level" in the EnvironmentConfig
      * object.
      */
+    @Deprecated
     public static final String TRACE_FILE = "java.util.logging.FileHandler.on";
 
     /**
@@ -3740,6 +3757,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * set "com.sleepycat.je.util.ConsoleHandler.level" in the
      * EnvironmentConfig object.
      */
+    @Deprecated
     public static final String TRACE_CONSOLE =
         "java.util.logging.ConsoleHandler.on";
 
@@ -3748,6 +3766,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * separated from the java.util.logging mechanism. This parameter has
      * no effect.
      */
+    @Deprecated
     public static final String TRACE_DB = "java.util.logging.DbLogHandler.on";
 
     /**
@@ -3757,6 +3776,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * through the java.util.logging configuration file, or through the
      * java.util.logging.LogManager.
      */
+    @Deprecated
     public static final String TRACE_FILE_LIMIT =
         "java.util.logging.FileHandler.limit";
 
@@ -3767,6 +3787,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * through the java.util.logging configuration file, or through the
      * java.util.logging.LogManager.
      */
+    @Deprecated
     public static final String TRACE_FILE_COUNT =
         "java.util.logging.FileHandler.count";
 
@@ -3776,6 +3797,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * through the java.util.logging configuration file, or through the
      * java.util.logging.LogManager.
      */
+    @Deprecated
     public static final String TRACE_LEVEL = "java.util.logging.level";
 
     /**
@@ -3841,6 +3863,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * java.util.logging configuration file, or through the
      * java.util.logging.LogManager.
      */
+    @Deprecated
     public static final String TRACE_LEVEL_LOCK_MANAGER =
         "java.util.logging.level.lockMgr";
 
@@ -3851,6 +3874,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * java.util.logging configuration file, or through the
      * java.util.logging.LogManager.
      */
+    @Deprecated
     public static final String TRACE_LEVEL_RECOVERY =
         "java.util.logging.level.recovery";
 
@@ -3861,6 +3885,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * java.util.logging configuration file, or through the
      * java.util.logging.LogManager.
      */
+    @Deprecated
     public static final String TRACE_LEVEL_EVICTOR =
         "java.util.logging.level.evictor";
 
@@ -3871,6 +3896,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * java.util.logging configuration file, or through the
      * java.util.logging.LogManager.
      */
+    @Deprecated
     public static final String TRACE_LEVEL_CLEANER =
         "java.util.logging.level.cleaner";
 
@@ -4140,6 +4166,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * @deprecated as of 4.0, replaced by {@link #setLockTimeout(long,
      * TimeUnit)}.
      */
+    @Deprecated
     public EnvironmentConfig setLockTimeout(long timeout)
         throws IllegalArgumentException {
 
@@ -4178,6 +4205,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      *
      * @deprecated as of 4.0, replaced by {@link #getLockTimeout(TimeUnit)}.
      */
+    @Deprecated
     public long getLockTimeout() {
         return getLockTimeout(TimeUnit.MICROSECONDS);
     }
@@ -4342,6 +4370,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      * @deprecated as of 4.0, replaced by {@link #setTxnTimeout(long,
      * TimeUnit)}.
      */
+    @Deprecated
     public EnvironmentConfig setTxnTimeout(long timeout)
         throws IllegalArgumentException {
 
@@ -4381,6 +4410,7 @@ public class EnvironmentConfig extends EnvironmentMutableConfig {
      *
      * @deprecated as of 4.0, replaced by {@link #getTxnTimeout(TimeUnit)}.
      */
+    @Deprecated
     public long getTxnTimeout() {
         return getTxnTimeout(TimeUnit.MICROSECONDS);
     }
diff --git a/stasis-core/src/main/java/com/sleepycat/je/EnvironmentMutableConfig.java b/stasis-core/src/main/java/com/sleepycat/je/EnvironmentMutableConfig.java
index c3b6870..df4ae7c 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/EnvironmentMutableConfig.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/EnvironmentMutableConfig.java
@@ -165,6 +165,7 @@ public class EnvironmentMutableConfig implements Cloneable, Serializable {
      *
      * @deprecated replaced by {@link #setDurability}
      */
+    @Deprecated
     public EnvironmentMutableConfig setTxnNoSync(boolean noSync) {
         setTxnNoSyncVoid(noSync);
         return this;
@@ -189,6 +190,7 @@ public class EnvironmentMutableConfig implements Cloneable, Serializable {
      *
      * @deprecated replaced by {@link #getDurability}
      */
+    @Deprecated
     public boolean getTxnNoSync() {
         return txnNoSync;
     }
@@ -216,6 +218,7 @@ public class EnvironmentMutableConfig implements Cloneable, Serializable {
      *
      * @deprecated replaced by {@link #setDurability}
      */
+    @Deprecated
     public EnvironmentMutableConfig setTxnWriteNoSync(boolean writeNoSync) {
         setTxnWriteNoSyncVoid(writeNoSync);
         return this;
@@ -240,6 +243,7 @@ public class EnvironmentMutableConfig implements Cloneable, Serializable {
      *
      * @deprecated replaced by {@link #getDurability}
      */
+    @Deprecated
     public boolean getTxnWriteNoSync() {
         return txnWriteNoSync;
     }
diff --git a/stasis-core/src/main/java/com/sleepycat/je/EnvironmentStats.java b/stasis-core/src/main/java/com/sleepycat/je/EnvironmentStats.java
index 50ac09d..40019c9 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/EnvironmentStats.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/EnvironmentStats.java
@@ -1047,6 +1047,7 @@ public class EnvironmentStats implements Serializable {
      * #getCurrentMinUtilization()} and {@link #getCurrentMaxUtilization()} to
      * monitor cleaner behavior.
      */
+    @Deprecated
     public int getCleanerBacklog() {
         return 0;
     }
@@ -1056,6 +1057,7 @@ public class EnvironmentStats implements Serializable {
      * #getProtectedLogSize()} {@link #getProtectedLogSizeMap()} to monitor
      * file protection.
      */
+    @Deprecated
     public int getFileDeletionBacklog() {
         return 0;
     }
@@ -1156,6 +1158,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated in JE 6.5, use {@link #getCurrentMinUtilization()} or
      * {@link #getCurrentMaxUtilization()} instead.
      */
+    @Deprecated
     public int getLastKnownUtilization() {
         return getCurrentMinUtilization();
     }
@@ -1164,6 +1167,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated in JE 6.3. Adjustments are no longer needed because LN log
      * sizes have been stored in the Btree since JE 6.0.
      */
+    @Deprecated
     public float getLNSizeCorrectionFactor() {
         return 1;
     }
@@ -1171,6 +1175,7 @@ public class EnvironmentStats implements Serializable {
     /**
      * @deprecated in JE 5.0.56, use {@link #getCorrectedAvgLNSize} instead.
      */
+    @Deprecated
     public float getCorrectedAvgLNSize() {
         return Float.NaN;
     }
@@ -1178,6 +1183,7 @@ public class EnvironmentStats implements Serializable {
     /**
      * @deprecated in JE 5.0.56, use {@link #getCorrectedAvgLNSize} instead.
      */
+    @Deprecated
     public float getEstimatedAvgLNSize() {
         return Float.NaN;
     }
@@ -1279,6 +1285,7 @@ public class EnvironmentStats implements Serializable {
     /**
      * @deprecated in JE 6.3, always returns zero.
      */
+    @Deprecated
     public long getNCleanerProbeRuns() {
         return 0;
     }
@@ -2263,6 +2270,7 @@ public class EnvironmentStats implements Serializable {
     /**
      * @deprecated The method returns 0 always.
      */
+    @Deprecated
     public long getRequiredEvictBytes() {
         return 0;
     }
@@ -2271,6 +2279,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has no meaning after the implementation
      * of the new evictor in JE 6.0. The method returns 0 always.
      */
+    @Deprecated
     public long getNNodesScanned() {
         return 0;
     }
@@ -2278,6 +2287,7 @@ public class EnvironmentStats implements Serializable {
     /**
      * @deprecated Use {@link #getNEvictionRuns()} instead.
      */
+    @Deprecated
     public long getNEvictPasses() {
         return cacheStats.getLong(EVICTOR_EVICTION_RUNS);
     }
@@ -2285,6 +2295,7 @@ public class EnvironmentStats implements Serializable {
     /**
      * @deprecated use {@link #getNNodesTargeted()} instead.
      */
+    @Deprecated
     public long getNNodesSelected() {
         return cacheStats.getLong(EVICTOR_NODES_TARGETED);
     }
@@ -2292,6 +2303,7 @@ public class EnvironmentStats implements Serializable {
     /**
      * @deprecated Use {@link #getNNodesEvicted()} instead.
      */
+    @Deprecated
     public long getNNodesExplicitlyEvicted() {
         return cacheStats.getLong(EVICTOR_NODES_EVICTED);
     }
@@ -2299,6 +2311,7 @@ public class EnvironmentStats implements Serializable {
     /**
      * @deprecated Use {@link #getNNodesStripped()} instead.
      */
+    @Deprecated
     public long getNBINsStripped() {
         return cacheStats.getLong(EVICTOR_NODES_STRIPPED);
     }
@@ -2306,6 +2319,7 @@ public class EnvironmentStats implements Serializable {
     /**
      * @deprecated Use {@link #getNNodesMutated()} instead.
      */
+    @Deprecated
     public long getNBINsMutated() {
         return cacheStats.getLong(EVICTOR_NODES_MUTATED);
     }
@@ -2924,6 +2938,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNBINsEvictedEvictorThread() {
         return 0;
     }
@@ -2932,6 +2947,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNBINsEvictedManual() {
         return 0;
     }
@@ -2940,6 +2956,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNBINsEvictedCritical() {
         return 0;
     }
@@ -2948,6 +2965,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNBINsEvictedCacheMode() {
         return 0;
     }
@@ -2956,6 +2974,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNBINsEvictedDaemon() {
         return 0;
     }
@@ -2964,6 +2983,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNUpperINsEvictedEvictorThread() {
         return 0;
     }
@@ -2972,6 +2992,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNUpperINsEvictedManual() {
         return 0;
     }
@@ -2980,6 +3001,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNUpperINsEvictedCritical() {
         return 0;
     }
@@ -2988,6 +3010,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNUpperINsEvictedCacheMode() {
         return 0;
     }
@@ -2996,6 +3019,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNUpperINsEvictedDaemon() {
         return 0;
     }
@@ -3004,6 +3028,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNBatchesEvictorThread() {
         return 0;
     }
@@ -3012,6 +3037,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNBatchesManual() {
         return 0;
     }
@@ -3020,6 +3046,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNBatchesCacheMode() {
         return 0;
     }
@@ -3028,6 +3055,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNBatchesCritical() {
         return 0;
     }
@@ -3036,6 +3064,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getNBatchesDaemon() {
         return 0;
     }
@@ -3129,6 +3158,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getAvgBatchEvictorThread() {
         return 0;
     }
@@ -3137,6 +3167,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getAvgBatchManual() {
         return 0;
     }
@@ -3145,6 +3176,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getAvgBatchCacheMode() {
         return 0;
     }
@@ -3153,6 +3185,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getAvgBatchCritical() {
         return 0;
     }
@@ -3161,6 +3194,7 @@ public class EnvironmentStats implements Serializable {
      * @deprecated This statistic has been removed. The method returns 0
      * always.
      */
+    @Deprecated
     public long getAvgBatchDaemon() {
         return 0;
     }
@@ -3314,6 +3348,7 @@ public class EnvironmentStats implements Serializable {
      * {@link #getBufferBytes} to get other components of the total cache usage
      * ({@link #getCacheTotalBytes}).
      */
+    @Deprecated
     public long getCacheDataBytes() {
         return getCacheTotalBytes() - getBufferBytes();
     }
diff --git a/stasis-core/src/main/java/com/sleepycat/je/LockNotGrantedException.java b/stasis-core/src/main/java/com/sleepycat/je/LockNotGrantedException.java
index 2143747..690b5d7 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/LockNotGrantedException.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/LockNotGrantedException.java
@@ -40,6 +40,7 @@ import com.sleepycat.je.txn.Locker;
  *
  * @deprecated replaced by {@link LockNotAvailableException}
  */
+@Deprecated
 public class LockNotGrantedException extends DeadlockException {
 
     private static final long serialVersionUID = 646414701L;
diff --git a/stasis-core/src/main/java/com/sleepycat/je/LockStats.java b/stasis-core/src/main/java/com/sleepycat/je/LockStats.java
index 4234227..43e007e 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/LockStats.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/LockStats.java
@@ -44,6 +44,7 @@ import com.sleepycat.je.utilint.StatGroup;
  * @deprecated as of 4.0.10, replaced by {@link
  * Environment#getStats(StatsConfig)}.</p>
  */
+@Deprecated
 public class LockStats implements Serializable {
 
     private static final long serialVersionUID = 172109534L;
diff --git a/stasis-core/src/main/java/com/sleepycat/je/PreloadStats.java b/stasis-core/src/main/java/com/sleepycat/je/PreloadStats.java
index 395daca..65f7dc9 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/PreloadStats.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/PreloadStats.java
@@ -127,6 +127,7 @@ public class PreloadStats implements Serializable {
      * @deprecated returns zero for data written using JE 5.0 and later, but
      * may return non-zero values when reading older data.
      */
+    @Deprecated
     public int getNDINsLoaded() {
         return nDINsLoaded;
     }
@@ -135,6 +136,7 @@ public class PreloadStats implements Serializable {
      * @deprecated returns zero for data written using JE 5.0 and later, but
      * may return non-zero values when reading older data.
      */
+    @Deprecated
     public int getNDBINsLoaded() {
         return nDBINsLoaded;
     }
@@ -143,6 +145,7 @@ public class PreloadStats implements Serializable {
      * @deprecated returns zero for data written using JE 5.0 and later, but
      * may return non-zero values when reading older data.
      */
+    @Deprecated
     public int getNDupCountLNsLoaded() {
         return nDupCountLNsLoaded;
     }
diff --git a/stasis-core/src/main/java/com/sleepycat/je/SecondaryCursor.java b/stasis-core/src/main/java/com/sleepycat/je/SecondaryCursor.java
index 9138079..cf4064b 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/SecondaryCursor.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/SecondaryCursor.java
@@ -159,6 +159,7 @@ public class SecondaryCursor extends Cursor {
      *
      * @deprecated As of JE 4.0.13, replaced by {@link Cursor#dup}.</p>
      */
+    @Deprecated
     public SecondaryCursor dupSecondary(final boolean samePosition) {
         return dup(samePosition);
     }
diff --git a/stasis-core/src/main/java/com/sleepycat/je/SecondaryDatabase.java b/stasis-core/src/main/java/com/sleepycat/je/SecondaryDatabase.java
index ac06bfb..a586093 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/SecondaryDatabase.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/SecondaryDatabase.java
@@ -562,6 +562,7 @@ public class SecondaryDatabase extends Database {
      * For internal use only.
      */
     @Override
+    @Deprecated
     public void populateSecondaries(final Transaction txn,
                                     final DatabaseEntry key,
                                     final DatabaseEntry data) {
@@ -616,6 +617,7 @@ public class SecondaryDatabase extends Database {
      * @deprecated As of JE 4.0.13, replaced by {@link
      * SecondaryDatabase#getConfig()}.
      */
+    @Deprecated
     public SecondaryConfig getSecondaryConfig() {
         return getConfig();
     }
@@ -663,6 +665,7 @@ public class SecondaryDatabase extends Database {
      * @deprecated As of JE 4.0.13, replaced by {@link
      * SecondaryDatabase#openCursor}.</p>
      */
+    @Deprecated
     public SecondaryCursor openSecondaryCursor(
         final Transaction txn,
         final CursorConfig cursorConfig) {
diff --git a/stasis-core/src/main/java/com/sleepycat/je/Transaction.java b/stasis-core/src/main/java/com/sleepycat/je/Transaction.java
index 516b690..752cfc8 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/Transaction.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/Transaction.java
@@ -704,6 +704,7 @@ public class Transaction {
      * @deprecated as of 4.0, replaced by {@link #setTxnTimeout(long,
      * TimeUnit)}.
      */
+    @Deprecated
     public void setTxnTimeout(long timeOut)
         throws IllegalArgumentException, DatabaseException {
 
@@ -783,6 +784,7 @@ public class Transaction {
      * @deprecated as of 4.0, replaced by {@link #setLockTimeout(long,
      * TimeUnit)}.
      */
+    @Deprecated
     public void setLockTimeout(long timeOut)
         throws IllegalArgumentException, DatabaseException {
 
diff --git a/stasis-core/src/main/java/com/sleepycat/je/TransactionConfig.java b/stasis-core/src/main/java/com/sleepycat/je/TransactionConfig.java
index 88e01e4..e22e096 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/TransactionConfig.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/TransactionConfig.java
@@ -153,6 +153,7 @@ public class TransactionConfig implements Cloneable {
      *
      * @return this
      */
+    @Deprecated
     public TransactionConfig setNoSync(final boolean noSync) {
         setNoSyncVoid(noSync);
         return this;
@@ -176,6 +177,7 @@ public class TransactionConfig implements Cloneable {
      *
      * @deprecated replaced by {@link #getDurability}
      */
+    @Deprecated
     public boolean getNoSync() {
         return noSync;
     }
@@ -202,6 +204,7 @@ public class TransactionConfig implements Cloneable {
      *
      * @return this
      */
+    @Deprecated
     public TransactionConfig setWriteNoSync(final boolean writeNoSync) {
         setWriteNoSyncVoid(writeNoSync);
         return this;
@@ -225,6 +228,7 @@ public class TransactionConfig implements Cloneable {
      *
      * @deprecated replaced by {@link #getDurability}
      */
+    @Deprecated
     public boolean getWriteNoSync() {
         return writeNoSync;
     }
diff --git a/stasis-core/src/main/java/com/sleepycat/je/config/EnvironmentParams.java b/stasis-core/src/main/java/com/sleepycat/je/config/EnvironmentParams.java
index f8d96e7..763d34f 100644
--- a/stasis-core/src/main/java/com/sleepycat/je/config/EnvironmentParams.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/config/EnvironmentParams.java
@@ -145,6 +145,7 @@ public class EnvironmentParams {
     /**
      * @deprecated as of JE 4.1
      */
+    @Deprecated
     private static final DurationConfigParam EVICTOR_WAKEUP_INTERVAL =
         new DurationConfigParam("je.evictor.wakeupInterval",
                                 "1 s",                 // min
@@ -754,6 +755,7 @@ public class EnvironmentParams {
     /**
      * @deprecated
      */
+    @Deprecated
     private static final BooleanConfigParam LOG_DIRECT_NIO =
         new BooleanConfigParam(EnvironmentConfig.LOG_DIRECT_NIO,
                                false,          // default
@@ -763,6 +765,7 @@ public class EnvironmentParams {
     /**
      * @deprecated
      */
+    @Deprecated
     private static final LongConfigParam LOG_CHUNKED_NIO =
         new LongConfigParam(EnvironmentConfig.LOG_CHUNKED_NIO,
                             0L,         // min
@@ -776,6 +779,7 @@ public class EnvironmentParams {
      *
      * Optimize cleaner operation for temporary deferred write DBs.
      */
+    @Deprecated
     public static final BooleanConfigParam LOG_DEFERREDWRITE_TEMP =
         new BooleanConfigParam("je.deferredWrite.temp",
                                false,          // default
@@ -937,6 +941,7 @@ public class EnvironmentParams {
     /**
      * @deprecated as of JE 6.0
      */
+    @Deprecated
     private static final IntConfigParam BIN_MAX_DELTAS =
         new IntConfigParam(EnvironmentConfig.TREE_MAX_DELTA,
                            0,      // min
@@ -1033,6 +1038,7 @@ public class EnvironmentParams {
      * When eviction happens, the evictor will push memory usage to this
      * percentage of je.maxMemory.
      */
+    @Deprecated
     private static final IntConfigParam EVICTOR_USEMEM_FLOOR =
         new IntConfigParam("je.evictor.useMemoryFloor",
                            50,        // min
@@ -1046,6 +1052,7 @@ public class EnvironmentParams {
      *
      * The evictor percentage of total nodes to scan per wakeup.
      */
+    @Deprecated
     private static final IntConfigParam EVICTOR_NODE_SCAN_PERCENTAGE =
         new IntConfigParam("je.evictor.nodeScanPercentage",
                            1,          // min
@@ -1059,6 +1066,7 @@ public class EnvironmentParams {
      *
      * The evictor percentage of scanned nodes to evict per wakeup.
      */
+    @Deprecated
     private static final
         IntConfigParam EVICTOR_EVICTION_BATCH_PERCENTAGE =
         new IntConfigParam("je.evictor.evictionBatchPercentage",
@@ -1071,6 +1079,7 @@ public class EnvironmentParams {
     /**
      * @deprecated as of JE 6.0
      */
+    @Deprecated
     private static final IntConfigParam EVICTOR_NODES_PER_SCAN =
         new IntConfigParam(EnvironmentConfig.EVICTOR_NODES_PER_SCAN,
                            1,           // min
@@ -1090,6 +1099,7 @@ public class EnvironmentParams {
     /**
      * @deprecated as of JE 4.1
      */
+    @Deprecated
     private static final IntConfigParam EVICTOR_RETRY =
         new IntConfigParam(EnvironmentConfig.EVICTOR_DEADLOCK_RETRY,
                             0,                 // min
@@ -1101,6 +1111,7 @@ public class EnvironmentParams {
     /**
      * @deprecated as of JE 6.0
      */
+    @Deprecated
     private static final BooleanConfigParam EVICTOR_LRU_ONLY =
         new BooleanConfigParam(EnvironmentConfig.EVICTOR_LRU_ONLY,
                                true,                  // default
@@ -1296,6 +1307,7 @@ public class EnvironmentParams {
      * @deprecated in JE 6.3. Adjustments are no longer needed because LN log
      * sizes have been stored in the Btree since JE 6.0.
      */
+    @Deprecated
     private static final BooleanConfigParam CLEANER_ADJUST_UTILIZATION =
         new BooleanConfigParam(EnvironmentConfig.CLEANER_ADJUST_UTILIZATION,
                                false, // default
@@ -1333,6 +1345,7 @@ public class EnvironmentParams {
     /**
      * @deprecated As of 1.7.1, no longer used.
      */
+    @Deprecated
     private static final IntConfigParam CLEANER_MIN_FILES_TO_DELETE =
         new IntConfigParam("je.cleaner.minFilesToDelete",
                            1,           // min
@@ -1344,6 +1357,7 @@ public class EnvironmentParams {
     /**
      * @deprecated As of 2.0, no longer used.
      */
+    @Deprecated
     private static final IntConfigParam CLEANER_RETRIES =
         new IntConfigParam("je.cleaner.retries",
                            0,           // min
@@ -1355,6 +1369,7 @@ public class EnvironmentParams {
     /**
      * @deprecated As of 2.0, no longer used.
      */
+    @Deprecated
     private static final IntConfigParam CLEANER_RESTART_RETRIES =
         new IntConfigParam("je.cleaner.restartRetries",
                            0,           // min
@@ -1374,6 +1389,7 @@ public class EnvironmentParams {
     /**
      * @deprecated in JE 6.3.
      */
+    @Deprecated
     private final IntConfigParam CLEANER_CALC_RECENT_LN_SIZES =
         new IntConfigParam("je.cleaner.calc.recentLNSizes",
                            1,        // min
@@ -1385,6 +1401,7 @@ public class EnvironmentParams {
     /**
      * @deprecated in JE 6.3.
      */
+    @Deprecated
     private static final IntConfigParam CLEANER_CALC_MIN_UNCOUNTED_LNS =
         new IntConfigParam("je.cleaner.calc.minUncountedLNs",
                            0,        // min
@@ -1396,6 +1413,7 @@ public class EnvironmentParams {
     /**
      * @deprecated in JE 6.3.
      */
+    @Deprecated
     private static final IntConfigParam CLEANER_CALC_INITIAL_ADJUSTMENTS =
         new IntConfigParam("je.cleaner.calc.initialAdjustments",
                            1,        // min
@@ -1407,6 +1425,7 @@ public class EnvironmentParams {
     /**
      * @deprecated in JE 6.3.
      */
+    @Deprecated
     private static final IntConfigParam CLEANER_CALC_MIN_PROBE_SKIP_FILES =
         new IntConfigParam("je.cleaner.calc.minProbeSkipFiles",
                            1,        // min
@@ -1418,6 +1437,7 @@ public class EnvironmentParams {
     /**
      * @deprecated in JE 6.3.
      */
+    @Deprecated
     private static final IntConfigParam CLEANER_CALC_MAX_PROBE_SKIP_FILES =
         new IntConfigParam("je.cleaner.calc.maxProbeSkipFiles",
                            1,        // min
@@ -1430,6 +1450,7 @@ public class EnvironmentParams {
      * @deprecated
      * Retained here only to avoid errors in old je.properties files.
      */
+    @Deprecated
     private static final BooleanConfigParam CLEANER_CLUSTER =
         new BooleanConfigParam("je.cleaner.cluster",
                                false,               // default
@@ -1440,6 +1461,7 @@ public class EnvironmentParams {
      * @deprecated
      * Retained here only to avoid errors in old je.properties files.
      */
+    @Deprecated
     private static final BooleanConfigParam CLEANER_CLUSTER_ALL =
         new BooleanConfigParam("je.cleaner.clusterAll",
                                false,              // default
@@ -1450,6 +1472,7 @@ public class EnvironmentParams {
      * @deprecated
      * Retained here only to avoid errors in old je.properties files.
      */
+    @Deprecated
     public static final IntConfigParam CLEANER_MAX_BATCH_FILES =
         new IntConfigParam(EnvironmentConfig.CLEANER_MAX_BATCH_FILES,
                            0,         // min
@@ -1603,6 +1626,7 @@ public class EnvironmentParams {
      * @deprecated
      * Retained here only to avoid errors in old je.properties files.
      */
+    @Deprecated
     private static final BooleanConfigParam
         CLEANER_FOREGROUND_PROACTIVE_MIGRATION = new BooleanConfigParam(
             EnvironmentConfig.CLEANER_FOREGROUND_PROACTIVE_MIGRATION,
@@ -1614,6 +1638,7 @@ public class EnvironmentParams {
      * @deprecated
      * Retained here only to avoid errors in old je.properties files.
      */
+    @Deprecated
     public static final BooleanConfigParam
         CLEANER_BACKGROUND_PROACTIVE_MIGRATION = new BooleanConfigParam(
             EnvironmentConfig.CLEANER_BACKGROUND_PROACTIVE_MIGRATION,
@@ -1625,6 +1650,7 @@ public class EnvironmentParams {
      * @deprecated
      * Retained here only to avoid errors in old je.properties files.
      */
+    @Deprecated
     private static final BooleanConfigParam CLEANER_LAZY_MIGRATION =
         new BooleanConfigParam(EnvironmentConfig.CLEANER_LAZY_MIGRATION,
                            false,             // default
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/BTreeStatDefinition.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/BTreeStatDefinition.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/BTreeStatDefinition.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/BTreeStatDefinition.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/CompressedOopsDetector.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/CompressedOopsDetector.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/CompressedOopsDetector.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/CompressedOopsDetector.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/CursorImpl.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/CursorImpl.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/CursorImpl.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/CursorImpl.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/DatabaseId.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/DatabaseId.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/DatabaseId.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/DatabaseId.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/DatabaseImpl.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/DatabaseImpl.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/DatabaseImpl.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/DatabaseImpl.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/DbConfigManager.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/DbConfigManager.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/DbConfigManager.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/DbConfigManager.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/DbEnvPool.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/DbEnvPool.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/DbEnvPool.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/DbEnvPool.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/DbEnvState.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/DbEnvState.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/DbEnvState.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/DbEnvState.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/DbTree.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/DbTree.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/DbTree.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/DbTree.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/DbType.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/DbType.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/DbType.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/DbType.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/DbiStatDefinition.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/DbiStatDefinition.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/DbiStatDefinition.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/DbiStatDefinition.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/DiskOrderedCursorImpl.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/DiskOrderedCursorImpl.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/DiskOrderedCursorImpl.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/DiskOrderedCursorImpl.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/DiskOrderedScanner.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/DiskOrderedScanner.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/DiskOrderedScanner.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/DiskOrderedScanner.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/DupKeyData.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/DupKeyData.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/DupKeyData.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/DupKeyData.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/EnvConfigObserver.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/EnvConfigObserver.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/EnvConfigObserver.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/EnvConfigObserver.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/EnvironmentFailureReason.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/EnvironmentFailureReason.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/EnvironmentFailureReason.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/EnvironmentFailureReason.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/EnvironmentImpl.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/EnvironmentImpl.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/EnvironmentImpl.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/EnvironmentImpl.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/ExpirationInfo.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/ExpirationInfo.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/ExpirationInfo.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/ExpirationInfo.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/GetMode.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/GetMode.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/GetMode.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/GetMode.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/INList.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/INList.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/INList.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/INList.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/LSNAccumulator.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/LSNAccumulator.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/LSNAccumulator.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/LSNAccumulator.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/MemoryBudget.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/MemoryBudget.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/MemoryBudget.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/MemoryBudget.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/NodeSequence.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/NodeSequence.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/NodeSequence.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/NodeSequence.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/Operation.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/Operation.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/Operation.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/Operation.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/PutMode.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/PutMode.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/PutMode.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/PutMode.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/RangeConstraint.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/RangeConstraint.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/RangeConstraint.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/RangeConstraint.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/RangeRestartException.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/RangeRestartException.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/RangeRestartException.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/RangeRestartException.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/RecordVersion.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/RecordVersion.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/RecordVersion.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/RecordVersion.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/RepConfigProxy.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/RepConfigProxy.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/RepConfigProxy.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/RepConfigProxy.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/ReplicatedDatabaseConfig.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/ReplicatedDatabaseConfig.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/ReplicatedDatabaseConfig.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/ReplicatedDatabaseConfig.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/SearchMode.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/SearchMode.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/SearchMode.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/SearchMode.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/SequenceStatDefinition.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/SequenceStatDefinition.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/SequenceStatDefinition.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/SequenceStatDefinition.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/SortedLSNTreeWalker.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/SortedLSNTreeWalker.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/SortedLSNTreeWalker.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/SortedLSNTreeWalker.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/StartupTracker.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/StartupTracker.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/StartupTracker.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/StartupTracker.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/TTL.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/TTL.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/TTL.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/TTL.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/TriggerManager.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/TriggerManager.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/TriggerManager.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/TriggerManager.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/TriggerUtils.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/TriggerUtils.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/TriggerUtils.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/TriggerUtils.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/TruncateResult.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/TruncateResult.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/TruncateResult.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/TruncateResult.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/TxnStatDefinition.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/TxnStatDefinition.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/TxnStatDefinition.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/TxnStatDefinition.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/VLSNProxy.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/VLSNProxy.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/VLSNProxy.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/VLSNProxy.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/dbi/package-info.java b/stasis-core/src/main/java/com/sleepycat/je/dbi/package-info.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/dbi/package-info.java
rename to stasis-core/src/main/java/com/sleepycat/je/dbi/package-info.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/ConsoleHandler.java b/stasis-core/src/main/java/com/sleepycat/je/util/ConsoleHandler.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/ConsoleHandler.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/ConsoleHandler.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbBackup.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbBackup.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbBackup.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbBackup.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbCacheSize.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbCacheSize.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbCacheSize.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbCacheSize.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbDeleteReservedFiles.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbDeleteReservedFiles.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbDeleteReservedFiles.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbDeleteReservedFiles.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbDump.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbDump.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbDump.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbDump.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbFilterStats.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbFilterStats.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbFilterStats.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbFilterStats.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbLoad.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbLoad.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbLoad.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbLoad.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbPrintLog.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbPrintLog.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbPrintLog.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbPrintLog.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbRunAction.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbRunAction.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbRunAction.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbRunAction.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbScavenger.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbScavenger.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbScavenger.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbScavenger.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbSpace.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbSpace.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbSpace.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbSpace.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbStat.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbStat.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbStat.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbStat.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbTruncateLog.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbTruncateLog.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbTruncateLog.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbTruncateLog.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbVerify.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbVerify.java
similarity index 99%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbVerify.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbVerify.java
index 90b2070..e27328c 100644
--- a/stasis-cli/src/main/java/com/sleepycat/je/util/DbVerify.java
+++ b/stasis-core/src/main/java/com/sleepycat/je/util/DbVerify.java
@@ -148,6 +148,7 @@ public class DbVerify {
      * {@link com.sleepycat.je.Database#verify} instead. These methods allow
      * specifying all {@link VerifyConfig} properties.
      */
+    @Deprecated
     public DbVerify(Environment env,
                     String dbName,
                     boolean quiet) {
@@ -267,6 +268,7 @@ public class DbVerify {
      * {@link com.sleepycat.je.Database#verify} instead. These methods allow
      * specifying all {@link VerifyConfig} properties.
      */
+    @Deprecated
     public boolean verify(PrintStream out)
         throws DatabaseException {
 
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/DbVerifyLog.java b/stasis-core/src/main/java/com/sleepycat/je/util/DbVerifyLog.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/DbVerifyLog.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/DbVerifyLog.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/FileHandler.java b/stasis-core/src/main/java/com/sleepycat/je/util/FileHandler.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/FileHandler.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/FileHandler.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/LogVerificationException.java b/stasis-core/src/main/java/com/sleepycat/je/util/LogVerificationException.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/LogVerificationException.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/LogVerificationException.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/LogVerificationInputStream.java b/stasis-core/src/main/java/com/sleepycat/je/util/LogVerificationInputStream.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/LogVerificationInputStream.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/LogVerificationInputStream.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/LogVerificationReadableByteChannel.java b/stasis-core/src/main/java/com/sleepycat/je/util/LogVerificationReadableByteChannel.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/LogVerificationReadableByteChannel.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/LogVerificationReadableByteChannel.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/Splitter.java b/stasis-core/src/main/java/com/sleepycat/je/util/Splitter.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/Splitter.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/Splitter.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/package.html b/stasis-core/src/main/java/com/sleepycat/je/util/package.html
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/package.html
rename to stasis-core/src/main/java/com/sleepycat/je/util/package.html
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/verify/BtreeVerifier.java b/stasis-core/src/main/java/com/sleepycat/je/util/verify/BtreeVerifier.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/verify/BtreeVerifier.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/verify/BtreeVerifier.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/verify/DataVerifier.java b/stasis-core/src/main/java/com/sleepycat/je/util/verify/DataVerifier.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/verify/DataVerifier.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/verify/DataVerifier.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/verify/VerifierUtils.java b/stasis-core/src/main/java/com/sleepycat/je/util/verify/VerifierUtils.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/verify/VerifierUtils.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/verify/VerifierUtils.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/util/verify/package-info.java b/stasis-core/src/main/java/com/sleepycat/je/util/verify/package-info.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/util/verify/package-info.java
rename to stasis-core/src/main/java/com/sleepycat/je/util/verify/package-info.java
diff --git a/stasis-cli/src/main/java/com/sleepycat/je/utilint/JarMain.java b/stasis-core/src/main/java/com/sleepycat/je/utilint/JarMain.java
similarity index 100%
rename from stasis-cli/src/main/java/com/sleepycat/je/utilint/JarMain.java
rename to stasis-core/src/main/java/com/sleepycat/je/utilint/JarMain.java
diff --git a/stasis-core/src/main/java/com/sleepycat/util/ExceptionWrapper.java b/stasis-core/src/main/java/com/sleepycat/util/ExceptionWrapper.java
index 9e7da65..0faae8c 100644
--- a/stasis-core/src/main/java/com/sleepycat/util/ExceptionWrapper.java
+++ b/stasis-core/src/main/java/com/sleepycat/util/ExceptionWrapper.java
@@ -27,6 +27,7 @@ public interface ExceptionWrapper {
      *
      * @deprecated replaced by {@link #getCause}.
      */
+    @Deprecated
     Throwable getDetail();
 
     /**
diff --git a/stasis-core/src/main/java/com/sleepycat/util/IOExceptionWrapper.java b/stasis-core/src/main/java/com/sleepycat/util/IOExceptionWrapper.java
index d355f5c..f2afd8c 100644
--- a/stasis-core/src/main/java/com/sleepycat/util/IOExceptionWrapper.java
+++ b/stasis-core/src/main/java/com/sleepycat/util/IOExceptionWrapper.java
@@ -36,6 +36,7 @@ public class IOExceptionWrapper
     /**
      * @deprecated replaced by {@link #getCause}.
      */
+    @Deprecated
     public Throwable getDetail() {
 
         return e;
diff --git a/stasis-core/src/main/java/com/sleepycat/util/RuntimeExceptionWrapper.java b/stasis-core/src/main/java/com/sleepycat/util/RuntimeExceptionWrapper.java
index 59ace18..2affabe 100644
--- a/stasis-core/src/main/java/com/sleepycat/util/RuntimeExceptionWrapper.java
+++ b/stasis-core/src/main/java/com/sleepycat/util/RuntimeExceptionWrapper.java
@@ -46,6 +46,7 @@ public class RuntimeExceptionWrapper extends RuntimeException
     /**
      * @deprecated replaced by {@link #getCause}.
      */
+    @Deprecated
     public Throwable getDetail() {
 
         return getCause();
diff --git a/je-7.5.11/examples/collections/access/AccessExample.java b/stasis-examples/src/main/java/com/example/collections/access/AccessExample.java
similarity index 100%
rename from je-7.5.11/examples/collections/access/AccessExample.java
rename to stasis-examples/src/main/java/com/example/collections/access/AccessExample.java
diff --git a/je-7.5.11/examples/collections/hello/HelloDatabaseWorld.java b/stasis-examples/src/main/java/com/example/collections/hello/HelloDatabaseWorld.java
similarity index 100%
rename from je-7.5.11/examples/collections/hello/HelloDatabaseWorld.java
rename to stasis-examples/src/main/java/com/example/collections/hello/HelloDatabaseWorld.java
diff --git a/je-7.5.11/examples/collections/ship/basic/PartData.java b/stasis-examples/src/main/java/com/example/collections/ship/basic/PartData.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/basic/PartData.java
rename to stasis-examples/src/main/java/com/example/collections/ship/basic/PartData.java
diff --git a/je-7.5.11/examples/collections/ship/basic/PartKey.java b/stasis-examples/src/main/java/com/example/collections/ship/basic/PartKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/basic/PartKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/basic/PartKey.java
diff --git a/je-7.5.11/examples/collections/ship/basic/Sample.java b/stasis-examples/src/main/java/com/example/collections/ship/basic/Sample.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/basic/Sample.java
rename to stasis-examples/src/main/java/com/example/collections/ship/basic/Sample.java
diff --git a/je-7.5.11/examples/collections/ship/basic/SampleDatabase.java b/stasis-examples/src/main/java/com/example/collections/ship/basic/SampleDatabase.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/basic/SampleDatabase.java
rename to stasis-examples/src/main/java/com/example/collections/ship/basic/SampleDatabase.java
diff --git a/je-7.5.11/examples/collections/ship/basic/SampleViews.java b/stasis-examples/src/main/java/com/example/collections/ship/basic/SampleViews.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/basic/SampleViews.java
rename to stasis-examples/src/main/java/com/example/collections/ship/basic/SampleViews.java
diff --git a/je-7.5.11/examples/collections/ship/basic/ShipmentData.java b/stasis-examples/src/main/java/com/example/collections/ship/basic/ShipmentData.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/basic/ShipmentData.java
rename to stasis-examples/src/main/java/com/example/collections/ship/basic/ShipmentData.java
diff --git a/je-7.5.11/examples/collections/ship/basic/ShipmentKey.java b/stasis-examples/src/main/java/com/example/collections/ship/basic/ShipmentKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/basic/ShipmentKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/basic/ShipmentKey.java
diff --git a/je-7.5.11/examples/collections/ship/basic/SupplierData.java b/stasis-examples/src/main/java/com/example/collections/ship/basic/SupplierData.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/basic/SupplierData.java
rename to stasis-examples/src/main/java/com/example/collections/ship/basic/SupplierData.java
diff --git a/je-7.5.11/examples/collections/ship/basic/SupplierKey.java b/stasis-examples/src/main/java/com/example/collections/ship/basic/SupplierKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/basic/SupplierKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/basic/SupplierKey.java
diff --git a/je-7.5.11/examples/collections/ship/basic/Weight.java b/stasis-examples/src/main/java/com/example/collections/ship/basic/Weight.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/basic/Weight.java
rename to stasis-examples/src/main/java/com/example/collections/ship/basic/Weight.java
diff --git a/je-7.5.11/examples/collections/ship/entity/Part.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/Part.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/Part.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/Part.java
diff --git a/je-7.5.11/examples/collections/ship/entity/PartData.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/PartData.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/PartData.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/PartData.java
diff --git a/je-7.5.11/examples/collections/ship/entity/PartKey.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/PartKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/PartKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/PartKey.java
diff --git a/je-7.5.11/examples/collections/ship/entity/Sample.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/Sample.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/Sample.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/Sample.java
diff --git a/je-7.5.11/examples/collections/ship/entity/SampleDatabase.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/SampleDatabase.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/SampleDatabase.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/SampleDatabase.java
diff --git a/je-7.5.11/examples/collections/ship/entity/SampleViews.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/SampleViews.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/SampleViews.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/SampleViews.java
diff --git a/je-7.5.11/examples/collections/ship/entity/Shipment.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/Shipment.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/Shipment.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/Shipment.java
diff --git a/je-7.5.11/examples/collections/ship/entity/ShipmentData.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/ShipmentData.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/ShipmentData.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/ShipmentData.java
diff --git a/je-7.5.11/examples/collections/ship/entity/ShipmentKey.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/ShipmentKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/ShipmentKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/ShipmentKey.java
diff --git a/je-7.5.11/examples/collections/ship/entity/Supplier.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/Supplier.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/Supplier.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/Supplier.java
diff --git a/je-7.5.11/examples/collections/ship/entity/SupplierData.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/SupplierData.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/SupplierData.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/SupplierData.java
diff --git a/je-7.5.11/examples/collections/ship/entity/SupplierKey.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/SupplierKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/SupplierKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/SupplierKey.java
diff --git a/je-7.5.11/examples/collections/ship/entity/Weight.java b/stasis-examples/src/main/java/com/example/collections/ship/entity/Weight.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/entity/Weight.java
rename to stasis-examples/src/main/java/com/example/collections/ship/entity/Weight.java
diff --git a/je-7.5.11/examples/collections/ship/factory/Part.java b/stasis-examples/src/main/java/com/example/collections/ship/factory/Part.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/factory/Part.java
rename to stasis-examples/src/main/java/com/example/collections/ship/factory/Part.java
diff --git a/je-7.5.11/examples/collections/ship/factory/PartKey.java b/stasis-examples/src/main/java/com/example/collections/ship/factory/PartKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/factory/PartKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/factory/PartKey.java
diff --git a/je-7.5.11/examples/collections/ship/factory/Sample.java b/stasis-examples/src/main/java/com/example/collections/ship/factory/Sample.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/factory/Sample.java
rename to stasis-examples/src/main/java/com/example/collections/ship/factory/Sample.java
diff --git a/je-7.5.11/examples/collections/ship/factory/SampleDatabase.java b/stasis-examples/src/main/java/com/example/collections/ship/factory/SampleDatabase.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/factory/SampleDatabase.java
rename to stasis-examples/src/main/java/com/example/collections/ship/factory/SampleDatabase.java
diff --git a/je-7.5.11/examples/collections/ship/factory/SampleViews.java b/stasis-examples/src/main/java/com/example/collections/ship/factory/SampleViews.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/factory/SampleViews.java
rename to stasis-examples/src/main/java/com/example/collections/ship/factory/SampleViews.java
diff --git a/je-7.5.11/examples/collections/ship/factory/Shipment.java b/stasis-examples/src/main/java/com/example/collections/ship/factory/Shipment.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/factory/Shipment.java
rename to stasis-examples/src/main/java/com/example/collections/ship/factory/Shipment.java
diff --git a/je-7.5.11/examples/collections/ship/factory/ShipmentKey.java b/stasis-examples/src/main/java/com/example/collections/ship/factory/ShipmentKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/factory/ShipmentKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/factory/ShipmentKey.java
diff --git a/je-7.5.11/examples/collections/ship/factory/Supplier.java b/stasis-examples/src/main/java/com/example/collections/ship/factory/Supplier.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/factory/Supplier.java
rename to stasis-examples/src/main/java/com/example/collections/ship/factory/Supplier.java
diff --git a/je-7.5.11/examples/collections/ship/factory/SupplierKey.java b/stasis-examples/src/main/java/com/example/collections/ship/factory/SupplierKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/factory/SupplierKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/factory/SupplierKey.java
diff --git a/je-7.5.11/examples/collections/ship/factory/Weight.java b/stasis-examples/src/main/java/com/example/collections/ship/factory/Weight.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/factory/Weight.java
rename to stasis-examples/src/main/java/com/example/collections/ship/factory/Weight.java
diff --git a/je-7.5.11/examples/collections/ship/index/PartData.java b/stasis-examples/src/main/java/com/example/collections/ship/index/PartData.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/index/PartData.java
rename to stasis-examples/src/main/java/com/example/collections/ship/index/PartData.java
diff --git a/je-7.5.11/examples/collections/ship/index/PartKey.java b/stasis-examples/src/main/java/com/example/collections/ship/index/PartKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/index/PartKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/index/PartKey.java
diff --git a/je-7.5.11/examples/collections/ship/index/Sample.java b/stasis-examples/src/main/java/com/example/collections/ship/index/Sample.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/index/Sample.java
rename to stasis-examples/src/main/java/com/example/collections/ship/index/Sample.java
diff --git a/je-7.5.11/examples/collections/ship/index/SampleDatabase.java b/stasis-examples/src/main/java/com/example/collections/ship/index/SampleDatabase.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/index/SampleDatabase.java
rename to stasis-examples/src/main/java/com/example/collections/ship/index/SampleDatabase.java
diff --git a/je-7.5.11/examples/collections/ship/index/SampleViews.java b/stasis-examples/src/main/java/com/example/collections/ship/index/SampleViews.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/index/SampleViews.java
rename to stasis-examples/src/main/java/com/example/collections/ship/index/SampleViews.java
diff --git a/je-7.5.11/examples/collections/ship/index/ShipmentData.java b/stasis-examples/src/main/java/com/example/collections/ship/index/ShipmentData.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/index/ShipmentData.java
rename to stasis-examples/src/main/java/com/example/collections/ship/index/ShipmentData.java
diff --git a/je-7.5.11/examples/collections/ship/index/ShipmentKey.java b/stasis-examples/src/main/java/com/example/collections/ship/index/ShipmentKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/index/ShipmentKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/index/ShipmentKey.java
diff --git a/je-7.5.11/examples/collections/ship/index/SupplierData.java b/stasis-examples/src/main/java/com/example/collections/ship/index/SupplierData.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/index/SupplierData.java
rename to stasis-examples/src/main/java/com/example/collections/ship/index/SupplierData.java
diff --git a/je-7.5.11/examples/collections/ship/index/SupplierKey.java b/stasis-examples/src/main/java/com/example/collections/ship/index/SupplierKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/index/SupplierKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/index/SupplierKey.java
diff --git a/je-7.5.11/examples/collections/ship/index/Weight.java b/stasis-examples/src/main/java/com/example/collections/ship/index/Weight.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/index/Weight.java
rename to stasis-examples/src/main/java/com/example/collections/ship/index/Weight.java
diff --git a/je-7.5.11/examples/collections/ship/marshal/MarshalledEntity.java b/stasis-examples/src/main/java/com/example/collections/ship/marshal/MarshalledEntity.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/marshal/MarshalledEntity.java
rename to stasis-examples/src/main/java/com/example/collections/ship/marshal/MarshalledEntity.java
diff --git a/je-7.5.11/examples/collections/ship/marshal/MarshalledKey.java b/stasis-examples/src/main/java/com/example/collections/ship/marshal/MarshalledKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/marshal/MarshalledKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/marshal/MarshalledKey.java
diff --git a/je-7.5.11/examples/collections/ship/marshal/Part.java b/stasis-examples/src/main/java/com/example/collections/ship/marshal/Part.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/marshal/Part.java
rename to stasis-examples/src/main/java/com/example/collections/ship/marshal/Part.java
diff --git a/je-7.5.11/examples/collections/ship/marshal/PartKey.java b/stasis-examples/src/main/java/com/example/collections/ship/marshal/PartKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/marshal/PartKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/marshal/PartKey.java
diff --git a/je-7.5.11/examples/collections/ship/marshal/Sample.java b/stasis-examples/src/main/java/com/example/collections/ship/marshal/Sample.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/marshal/Sample.java
rename to stasis-examples/src/main/java/com/example/collections/ship/marshal/Sample.java
diff --git a/je-7.5.11/examples/collections/ship/marshal/SampleDatabase.java b/stasis-examples/src/main/java/com/example/collections/ship/marshal/SampleDatabase.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/marshal/SampleDatabase.java
rename to stasis-examples/src/main/java/com/example/collections/ship/marshal/SampleDatabase.java
diff --git a/je-7.5.11/examples/collections/ship/marshal/SampleViews.java b/stasis-examples/src/main/java/com/example/collections/ship/marshal/SampleViews.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/marshal/SampleViews.java
rename to stasis-examples/src/main/java/com/example/collections/ship/marshal/SampleViews.java
diff --git a/je-7.5.11/examples/collections/ship/marshal/Shipment.java b/stasis-examples/src/main/java/com/example/collections/ship/marshal/Shipment.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/marshal/Shipment.java
rename to stasis-examples/src/main/java/com/example/collections/ship/marshal/Shipment.java
diff --git a/je-7.5.11/examples/collections/ship/marshal/ShipmentKey.java b/stasis-examples/src/main/java/com/example/collections/ship/marshal/ShipmentKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/marshal/ShipmentKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/marshal/ShipmentKey.java
diff --git a/je-7.5.11/examples/collections/ship/marshal/Supplier.java b/stasis-examples/src/main/java/com/example/collections/ship/marshal/Supplier.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/marshal/Supplier.java
rename to stasis-examples/src/main/java/com/example/collections/ship/marshal/Supplier.java
diff --git a/je-7.5.11/examples/collections/ship/marshal/SupplierKey.java b/stasis-examples/src/main/java/com/example/collections/ship/marshal/SupplierKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/marshal/SupplierKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/marshal/SupplierKey.java
diff --git a/je-7.5.11/examples/collections/ship/marshal/Weight.java b/stasis-examples/src/main/java/com/example/collections/ship/marshal/Weight.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/marshal/Weight.java
rename to stasis-examples/src/main/java/com/example/collections/ship/marshal/Weight.java
diff --git a/je-7.5.11/examples/collections/ship/sentity/Part.java b/stasis-examples/src/main/java/com/example/collections/ship/sentity/Part.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/sentity/Part.java
rename to stasis-examples/src/main/java/com/example/collections/ship/sentity/Part.java
diff --git a/je-7.5.11/examples/collections/ship/sentity/PartKey.java b/stasis-examples/src/main/java/com/example/collections/ship/sentity/PartKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/sentity/PartKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/sentity/PartKey.java
diff --git a/je-7.5.11/examples/collections/ship/sentity/Sample.java b/stasis-examples/src/main/java/com/example/collections/ship/sentity/Sample.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/sentity/Sample.java
rename to stasis-examples/src/main/java/com/example/collections/ship/sentity/Sample.java
diff --git a/je-7.5.11/examples/collections/ship/sentity/SampleDatabase.java b/stasis-examples/src/main/java/com/example/collections/ship/sentity/SampleDatabase.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/sentity/SampleDatabase.java
rename to stasis-examples/src/main/java/com/example/collections/ship/sentity/SampleDatabase.java
diff --git a/je-7.5.11/examples/collections/ship/sentity/SampleViews.java b/stasis-examples/src/main/java/com/example/collections/ship/sentity/SampleViews.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/sentity/SampleViews.java
rename to stasis-examples/src/main/java/com/example/collections/ship/sentity/SampleViews.java
diff --git a/je-7.5.11/examples/collections/ship/sentity/Shipment.java b/stasis-examples/src/main/java/com/example/collections/ship/sentity/Shipment.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/sentity/Shipment.java
rename to stasis-examples/src/main/java/com/example/collections/ship/sentity/Shipment.java
diff --git a/je-7.5.11/examples/collections/ship/sentity/ShipmentKey.java b/stasis-examples/src/main/java/com/example/collections/ship/sentity/ShipmentKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/sentity/ShipmentKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/sentity/ShipmentKey.java
diff --git a/je-7.5.11/examples/collections/ship/sentity/Supplier.java b/stasis-examples/src/main/java/com/example/collections/ship/sentity/Supplier.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/sentity/Supplier.java
rename to stasis-examples/src/main/java/com/example/collections/ship/sentity/Supplier.java
diff --git a/je-7.5.11/examples/collections/ship/sentity/SupplierKey.java b/stasis-examples/src/main/java/com/example/collections/ship/sentity/SupplierKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/sentity/SupplierKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/sentity/SupplierKey.java
diff --git a/je-7.5.11/examples/collections/ship/sentity/Weight.java b/stasis-examples/src/main/java/com/example/collections/ship/sentity/Weight.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/sentity/Weight.java
rename to stasis-examples/src/main/java/com/example/collections/ship/sentity/Weight.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/Part.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/Part.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/Part.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/Part.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/PartData.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/PartData.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/PartData.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/PartData.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/PartKey.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/PartKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/PartKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/PartKey.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/Sample.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/Sample.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/Sample.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/Sample.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/SampleDatabase.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/SampleDatabase.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/SampleDatabase.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/SampleDatabase.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/SampleViews.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/SampleViews.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/SampleViews.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/SampleViews.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/Shipment.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/Shipment.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/Shipment.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/Shipment.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/ShipmentData.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/ShipmentData.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/ShipmentData.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/ShipmentData.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/ShipmentKey.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/ShipmentKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/ShipmentKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/ShipmentKey.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/Supplier.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/Supplier.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/Supplier.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/Supplier.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/SupplierData.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/SupplierData.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/SupplierData.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/SupplierData.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/SupplierKey.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/SupplierKey.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/SupplierKey.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/SupplierKey.java
diff --git a/je-7.5.11/examples/collections/ship/tuple/Weight.java b/stasis-examples/src/main/java/com/example/collections/ship/tuple/Weight.java
similarity index 100%
rename from je-7.5.11/examples/collections/ship/tuple/Weight.java
rename to stasis-examples/src/main/java/com/example/collections/ship/tuple/Weight.java
diff --git a/je-7.5.11/examples/jca/HOWTO-jboss.txt b/stasis-examples/src/main/java/com/example/jca/HOWTO-jboss.txt
similarity index 100%
rename from je-7.5.11/examples/jca/HOWTO-jboss.txt
rename to stasis-examples/src/main/java/com/example/jca/HOWTO-jboss.txt
diff --git a/je-7.5.11/examples/jca/HOWTO-oc4j.txt b/stasis-examples/src/main/java/com/example/jca/HOWTO-oc4j.txt
similarity index 100%
rename from je-7.5.11/examples/jca/HOWTO-oc4j.txt
rename to stasis-examples/src/main/java/com/example/jca/HOWTO-oc4j.txt
diff --git a/je-7.5.11/examples/jca/HOWTO-sjsas.txt b/stasis-examples/src/main/java/com/example/jca/HOWTO-sjsas.txt
similarity index 100%
rename from je-7.5.11/examples/jca/HOWTO-sjsas.txt
rename to stasis-examples/src/main/java/com/example/jca/HOWTO-sjsas.txt
diff --git a/je-7.5.11/examples/jca/jboss/jboss.xml b/stasis-examples/src/main/java/com/example/jca/jboss/jboss.xml
similarity index 100%
rename from je-7.5.11/examples/jca/jboss/jboss.xml
rename to stasis-examples/src/main/java/com/example/jca/jboss/jboss.xml
diff --git a/je-7.5.11/examples/jca/jboss/je-localtx-ds.xml b/stasis-examples/src/main/java/com/example/jca/jboss/je-localtx-ds.xml
similarity index 100%
rename from je-7.5.11/examples/jca/jboss/je-localtx-ds.xml
rename to stasis-examples/src/main/java/com/example/jca/jboss/je-localtx-ds.xml
diff --git a/je-7.5.11/examples/jca/jboss/je-no-tx-ds.xml b/stasis-examples/src/main/java/com/example/jca/jboss/je-no-tx-ds.xml
similarity index 100%
rename from je-7.5.11/examples/jca/jboss/je-no-tx-ds.xml
rename to stasis-examples/src/main/java/com/example/jca/jboss/je-no-tx-ds.xml
diff --git a/je-7.5.11/examples/jca/jboss/je-xa-ds.xml b/stasis-examples/src/main/java/com/example/jca/jboss/je-xa-ds.xml
similarity index 100%
rename from je-7.5.11/examples/jca/jboss/je-xa-ds.xml
rename to stasis-examples/src/main/java/com/example/jca/jboss/je-xa-ds.xml
diff --git a/je-7.5.11/examples/jca/oc4j/orion-ejb-jar.xml b/stasis-examples/src/main/java/com/example/jca/oc4j/orion-ejb-jar.xml
similarity index 100%
rename from je-7.5.11/examples/jca/oc4j/orion-ejb-jar.xml
rename to stasis-examples/src/main/java/com/example/jca/oc4j/orion-ejb-jar.xml
diff --git a/je-7.5.11/examples/jca/simple/Simple.java b/stasis-examples/src/main/java/com/example/jca/simple/Simple.java
similarity index 100%
rename from je-7.5.11/examples/jca/simple/Simple.java
rename to stasis-examples/src/main/java/com/example/jca/simple/Simple.java
diff --git a/je-7.5.11/examples/jca/simple/SimpleBean.java b/stasis-examples/src/main/java/com/example/jca/simple/SimpleBean.java
similarity index 100%
rename from je-7.5.11/examples/jca/simple/SimpleBean.java
rename to stasis-examples/src/main/java/com/example/jca/simple/SimpleBean.java
diff --git a/je-7.5.11/examples/jca/simple/SimpleClient.java b/stasis-examples/src/main/java/com/example/jca/simple/SimpleClient.java
similarity index 100%
rename from je-7.5.11/examples/jca/simple/SimpleClient.java
rename to stasis-examples/src/main/java/com/example/jca/simple/SimpleClient.java
diff --git a/je-7.5.11/examples/jca/simple/SimpleHome.java b/stasis-examples/src/main/java/com/example/jca/simple/SimpleHome.java
similarity index 100%
rename from je-7.5.11/examples/jca/simple/SimpleHome.java
rename to stasis-examples/src/main/java/com/example/jca/simple/SimpleHome.java
diff --git a/je-7.5.11/examples/jca/simple/ejb-jar.xml b/stasis-examples/src/main/java/com/example/jca/simple/ejb-jar.xml
similarity index 100%
rename from je-7.5.11/examples/jca/simple/ejb-jar.xml
rename to stasis-examples/src/main/java/com/example/jca/simple/ejb-jar.xml
diff --git a/je-7.5.11/examples/jca/sjsas8_1/sun-ejb-jar.xml b/stasis-examples/src/main/java/com/example/jca/sjsas8_1/sun-ejb-jar.xml
similarity index 100%
rename from je-7.5.11/examples/jca/sjsas8_1/sun-ejb-jar.xml
rename to stasis-examples/src/main/java/com/example/jca/sjsas8_1/sun-ejb-jar.xml
diff --git a/je-7.5.11/examples/je/BindingExample.java b/stasis-examples/src/main/java/com/example/je/BindingExample.java
similarity index 100%
rename from je-7.5.11/examples/je/BindingExample.java
rename to stasis-examples/src/main/java/com/example/je/BindingExample.java
diff --git a/je-7.5.11/examples/je/MeasureInsertSize.java b/stasis-examples/src/main/java/com/example/je/MeasureInsertSize.java
similarity index 100%
rename from je-7.5.11/examples/je/MeasureInsertSize.java
rename to stasis-examples/src/main/java/com/example/je/MeasureInsertSize.java
diff --git a/je-7.5.11/examples/je/SecondaryExample.java b/stasis-examples/src/main/java/com/example/je/SecondaryExample.java
similarity index 100%
rename from je-7.5.11/examples/je/SecondaryExample.java
rename to stasis-examples/src/main/java/com/example/je/SecondaryExample.java
diff --git a/je-7.5.11/examples/je/SequenceExample.java b/stasis-examples/src/main/java/com/example/je/SequenceExample.java
similarity index 100%
rename from je-7.5.11/examples/je/SequenceExample.java
rename to stasis-examples/src/main/java/com/example/je/SequenceExample.java
diff --git a/je-7.5.11/examples/je/SimpleExample.java b/stasis-examples/src/main/java/com/example/je/SimpleExample.java
similarity index 100%
rename from je-7.5.11/examples/je/SimpleExample.java
rename to stasis-examples/src/main/java/com/example/je/SimpleExample.java
diff --git a/je-7.5.11/examples/je/ToManyExample.java b/stasis-examples/src/main/java/com/example/je/ToManyExample.java
similarity index 100%
rename from je-7.5.11/examples/je/ToManyExample.java
rename to stasis-examples/src/main/java/com/example/je/ToManyExample.java
diff --git a/je-7.5.11/examples/je/gettingStarted/ExampleDatabasePut.java b/stasis-examples/src/main/java/com/example/je/gettingStarted/ExampleDatabasePut.java
similarity index 100%
rename from je-7.5.11/examples/je/gettingStarted/ExampleDatabasePut.java
rename to stasis-examples/src/main/java/com/example/je/gettingStarted/ExampleDatabasePut.java
diff --git a/je-7.5.11/examples/je/gettingStarted/ExampleInventoryRead.java b/stasis-examples/src/main/java/com/example/je/gettingStarted/ExampleInventoryRead.java
similarity index 100%
rename from je-7.5.11/examples/je/gettingStarted/ExampleInventoryRead.java
rename to stasis-examples/src/main/java/com/example/je/gettingStarted/ExampleInventoryRead.java
diff --git a/je-7.5.11/examples/je/gettingStarted/Inventory.java b/stasis-examples/src/main/java/com/example/je/gettingStarted/Inventory.java
similarity index 100%
rename from je-7.5.11/examples/je/gettingStarted/Inventory.java
rename to stasis-examples/src/main/java/com/example/je/gettingStarted/Inventory.java
diff --git a/je-7.5.11/examples/je/gettingStarted/InventoryBinding.java b/stasis-examples/src/main/java/com/example/je/gettingStarted/InventoryBinding.java
similarity index 100%
rename from je-7.5.11/examples/je/gettingStarted/InventoryBinding.java
rename to stasis-examples/src/main/java/com/example/je/gettingStarted/InventoryBinding.java
diff --git a/je-7.5.11/examples/je/gettingStarted/ItemNameKeyCreator.java b/stasis-examples/src/main/java/com/example/je/gettingStarted/ItemNameKeyCreator.java
similarity index 100%
rename from je-7.5.11/examples/je/gettingStarted/ItemNameKeyCreator.java
rename to stasis-examples/src/main/java/com/example/je/gettingStarted/ItemNameKeyCreator.java
diff --git a/je-7.5.11/examples/je/gettingStarted/MyDbEnv.java b/stasis-examples/src/main/java/com/example/je/gettingStarted/MyDbEnv.java
similarity index 100%
rename from je-7.5.11/examples/je/gettingStarted/MyDbEnv.java
rename to stasis-examples/src/main/java/com/example/je/gettingStarted/MyDbEnv.java
diff --git a/je-7.5.11/examples/je/gettingStarted/Vendor.java b/stasis-examples/src/main/java/com/example/je/gettingStarted/Vendor.java
similarity index 100%
rename from je-7.5.11/examples/je/gettingStarted/Vendor.java
rename to stasis-examples/src/main/java/com/example/je/gettingStarted/Vendor.java
diff --git a/je-7.5.11/examples/je/gettingStarted/inventory.txt b/stasis-examples/src/main/java/com/example/je/gettingStarted/inventory.txt
similarity index 100%
rename from je-7.5.11/examples/je/gettingStarted/inventory.txt
rename to stasis-examples/src/main/java/com/example/je/gettingStarted/inventory.txt
diff --git a/je-7.5.11/examples/je/gettingStarted/vendors.txt b/stasis-examples/src/main/java/com/example/je/gettingStarted/vendors.txt
similarity index 100%
rename from je-7.5.11/examples/je/gettingStarted/vendors.txt
rename to stasis-examples/src/main/java/com/example/je/gettingStarted/vendors.txt
diff --git a/je-7.5.11/examples/je/rep/quote/Command.java b/stasis-examples/src/main/java/com/example/je/rep/quote/Command.java
similarity index 100%
rename from je-7.5.11/examples/je/rep/quote/Command.java
rename to stasis-examples/src/main/java/com/example/je/rep/quote/Command.java
diff --git a/je-7.5.11/examples/je/rep/quote/DataAccessor.java b/stasis-examples/src/main/java/com/example/je/rep/quote/DataAccessor.java
similarity index 100%
rename from je-7.5.11/examples/je/rep/quote/DataAccessor.java
rename to stasis-examples/src/main/java/com/example/je/rep/quote/DataAccessor.java
diff --git a/je-7.5.11/examples/je/rep/quote/HARouter.java b/stasis-examples/src/main/java/com/example/je/rep/quote/HARouter.java
similarity index 100%
rename from je-7.5.11/examples/je/rep/quote/HARouter.java
rename to stasis-examples/src/main/java/com/example/je/rep/quote/HARouter.java
diff --git a/je-7.5.11/examples/je/rep/quote/Quote.java b/stasis-examples/src/main/java/com/example/je/rep/quote/Quote.java
similarity index 100%
rename from je-7.5.11/examples/je/rep/quote/Quote.java
rename to stasis-examples/src/main/java/com/example/je/rep/quote/Quote.java
diff --git a/je-7.5.11/examples/je/rep/quote/QuoteUtil.java b/stasis-examples/src/main/java/com/example/je/rep/quote/QuoteUtil.java
similarity index 100%
rename from je-7.5.11/examples/je/rep/quote/QuoteUtil.java
rename to stasis-examples/src/main/java/com/example/je/rep/quote/QuoteUtil.java
diff --git a/je-7.5.11/examples/je/rep/quote/RouterDrivenStockQuotes.java b/stasis-examples/src/main/java/com/example/je/rep/quote/RouterDrivenStockQuotes.java
similarity index 100%
rename from je-7.5.11/examples/je/rep/quote/RouterDrivenStockQuotes.java
rename to stasis-examples/src/main/java/com/example/je/rep/quote/RouterDrivenStockQuotes.java
diff --git a/je-7.5.11/examples/je/rep/quote/RunTransaction.java b/stasis-examples/src/main/java/com/example/je/rep/quote/RunTransaction.java
similarity index 100%
rename from je-7.5.11/examples/je/rep/quote/RunTransaction.java
rename to stasis-examples/src/main/java/com/example/je/rep/quote/RunTransaction.java
diff --git a/je-7.5.11/examples/je/rep/quote/SimpleRouter.java b/stasis-examples/src/main/java/com/example/je/rep/quote/SimpleRouter.java
similarity index 100%
rename from je-7.5.11/examples/je/rep/quote/SimpleRouter.java
rename to stasis-examples/src/main/java/com/example/je/rep/quote/SimpleRouter.java
diff --git a/je-7.5.11/examples/je/rep/quote/StockQuotes.java b/stasis-examples/src/main/java/com/example/je/rep/quote/StockQuotes.java
similarity index 100%
rename from je-7.5.11/examples/je/rep/quote/StockQuotes.java
rename to stasis-examples/src/main/java/com/example/je/rep/quote/StockQuotes.java
diff --git a/je-7.5.11/examples/je/rep/quote/StockQuotesRMIForwarding.java b/stasis-examples/src/main/java/com/example/je/rep/quote/StockQuotesRMIForwarding.java
similarity index 100%
rename from je-7.5.11/examples/je/rep/quote/StockQuotesRMIForwarding.java
rename to stasis-examples/src/main/java/com/example/je/rep/quote/StockQuotesRMIForwarding.java
diff --git a/je-7.5.11/examples/je/rep/quote/UpdateForwardingStockQuotes.java b/stasis-examples/src/main/java/com/example/je/rep/quote/UpdateForwardingStockQuotes.java
similarity index 100%
rename from je-7.5.11/examples/je/rep/quote/UpdateForwardingStockQuotes.java
rename to stasis-examples/src/main/java/com/example/je/rep/quote/UpdateForwardingStockQuotes.java
diff --git a/je-7.5.11/examples/je/rep/quote/package.html b/stasis-examples/src/main/java/com/example/je/rep/quote/package.html
similarity index 100%
rename from je-7.5.11/examples/je/rep/quote/package.html
rename to stasis-examples/src/main/java/com/example/je/rep/quote/package.html
diff --git a/je-7.5.11/examples/je/txn/DBWriter.java b/stasis-examples/src/main/java/com/example/je/txn/DBWriter.java
similarity index 100%
rename from je-7.5.11/examples/je/txn/DBWriter.java
rename to stasis-examples/src/main/java/com/example/je/txn/DBWriter.java
diff --git a/je-7.5.11/examples/je/txn/PayloadData.java b/stasis-examples/src/main/java/com/example/je/txn/PayloadData.java
similarity index 100%
rename from je-7.5.11/examples/je/txn/PayloadData.java
rename to stasis-examples/src/main/java/com/example/je/txn/PayloadData.java
diff --git a/je-7.5.11/examples/je/txn/TxnGuide.java b/stasis-examples/src/main/java/com/example/je/txn/TxnGuide.java
similarity index 100%
rename from je-7.5.11/examples/je/txn/TxnGuide.java
rename to stasis-examples/src/main/java/com/example/je/txn/TxnGuide.java
diff --git a/je-7.5.11/examples/jmx/JEApplicationMBean.java b/stasis-examples/src/main/java/com/example/jmx/JEApplicationMBean.java
similarity index 100%
rename from je-7.5.11/examples/jmx/JEApplicationMBean.java
rename to stasis-examples/src/main/java/com/example/jmx/JEApplicationMBean.java
diff --git a/je-7.5.11/examples/jmx/README.txt b/stasis-examples/src/main/java/com/example/jmx/README.txt
similarity index 100%
rename from je-7.5.11/examples/jmx/README.txt
rename to stasis-examples/src/main/java/com/example/jmx/README.txt
diff --git a/je-7.5.11/examples/jmx/je-jboss-service.xml b/stasis-examples/src/main/java/com/example/jmx/je-jboss-service.xml
similarity index 100%
rename from je-7.5.11/examples/jmx/je-jboss-service.xml
rename to stasis-examples/src/main/java/com/example/jmx/je-jboss-service.xml
diff --git a/je-7.5.11/examples/persist/CustomKeyOrderExample.java b/stasis-examples/src/main/java/com/example/persist/CustomKeyOrderExample.java
similarity index 100%
rename from je-7.5.11/examples/persist/CustomKeyOrderExample.java
rename to stasis-examples/src/main/java/com/example/persist/CustomKeyOrderExample.java
diff --git a/je-7.5.11/examples/persist/DplDump.java b/stasis-examples/src/main/java/com/example/persist/DplDump.java
similarity index 100%
rename from je-7.5.11/examples/persist/DplDump.java
rename to stasis-examples/src/main/java/com/example/persist/DplDump.java
diff --git a/je-7.5.11/examples/persist/EventExample.java b/stasis-examples/src/main/java/com/example/persist/EventExample.java
similarity index 100%
rename from je-7.5.11/examples/persist/EventExample.java
rename to stasis-examples/src/main/java/com/example/persist/EventExample.java
diff --git a/je-7.5.11/examples/persist/EventExampleDPL.java b/stasis-examples/src/main/java/com/example/persist/EventExampleDPL.java
similarity index 100%
rename from je-7.5.11/examples/persist/EventExampleDPL.java
rename to stasis-examples/src/main/java/com/example/persist/EventExampleDPL.java
diff --git a/je-7.5.11/examples/persist/PersonExample.java b/stasis-examples/src/main/java/com/example/persist/PersonExample.java
similarity index 100%
rename from je-7.5.11/examples/persist/PersonExample.java
rename to stasis-examples/src/main/java/com/example/persist/PersonExample.java
diff --git a/je-7.5.11/examples/persist/ScalaPersonExample.scala b/stasis-examples/src/main/java/com/example/persist/ScalaPersonExample.scala
similarity index 100%
rename from je-7.5.11/examples/persist/ScalaPersonExample.scala
rename to stasis-examples/src/main/java/com/example/persist/ScalaPersonExample.scala
diff --git a/je-7.5.11/examples/persist/gettingStarted/DataAccessor.java b/stasis-examples/src/main/java/com/example/persist/gettingStarted/DataAccessor.java
similarity index 100%
rename from je-7.5.11/examples/persist/gettingStarted/DataAccessor.java
rename to stasis-examples/src/main/java/com/example/persist/gettingStarted/DataAccessor.java
diff --git a/je-7.5.11/examples/persist/gettingStarted/ExampleDatabasePut.java b/stasis-examples/src/main/java/com/example/persist/gettingStarted/ExampleDatabasePut.java
similarity index 100%
rename from je-7.5.11/examples/persist/gettingStarted/ExampleDatabasePut.java
rename to stasis-examples/src/main/java/com/example/persist/gettingStarted/ExampleDatabasePut.java
diff --git a/je-7.5.11/examples/persist/gettingStarted/ExampleInventoryRead.java b/stasis-examples/src/main/java/com/example/persist/gettingStarted/ExampleInventoryRead.java
similarity index 100%
rename from je-7.5.11/examples/persist/gettingStarted/ExampleInventoryRead.java
rename to stasis-examples/src/main/java/com/example/persist/gettingStarted/ExampleInventoryRead.java
diff --git a/je-7.5.11/examples/persist/gettingStarted/Inventory.java b/stasis-examples/src/main/java/com/example/persist/gettingStarted/Inventory.java
similarity index 100%
rename from je-7.5.11/examples/persist/gettingStarted/Inventory.java
rename to stasis-examples/src/main/java/com/example/persist/gettingStarted/Inventory.java
diff --git a/je-7.5.11/examples/persist/gettingStarted/MyDbEnv.java b/stasis-examples/src/main/java/com/example/persist/gettingStarted/MyDbEnv.java
similarity index 100%
rename from je-7.5.11/examples/persist/gettingStarted/MyDbEnv.java
rename to stasis-examples/src/main/java/com/example/persist/gettingStarted/MyDbEnv.java
diff --git a/je-7.5.11/examples/persist/gettingStarted/Vendor.java b/stasis-examples/src/main/java/com/example/persist/gettingStarted/Vendor.java
similarity index 100%
rename from je-7.5.11/examples/persist/gettingStarted/Vendor.java
rename to stasis-examples/src/main/java/com/example/persist/gettingStarted/Vendor.java
diff --git a/je-7.5.11/examples/persist/gettingStarted/inventory.txt b/stasis-examples/src/main/java/com/example/persist/gettingStarted/inventory.txt
similarity index 100%
rename from je-7.5.11/examples/persist/gettingStarted/inventory.txt
rename to stasis-examples/src/main/java/com/example/persist/gettingStarted/inventory.txt
diff --git a/je-7.5.11/examples/persist/gettingStarted/vendors.txt b/stasis-examples/src/main/java/com/example/persist/gettingStarted/vendors.txt
similarity index 100%
rename from je-7.5.11/examples/persist/gettingStarted/vendors.txt
rename to stasis-examples/src/main/java/com/example/persist/gettingStarted/vendors.txt
diff --git a/je-7.5.11/examples/persist/sqlapp/DataAccessor.java b/stasis-examples/src/main/java/com/example/persist/sqlapp/DataAccessor.java
similarity index 100%
rename from je-7.5.11/examples/persist/sqlapp/DataAccessor.java
rename to stasis-examples/src/main/java/com/example/persist/sqlapp/DataAccessor.java
diff --git a/je-7.5.11/examples/persist/sqlapp/Department.java b/stasis-examples/src/main/java/com/example/persist/sqlapp/Department.java
similarity index 100%
rename from je-7.5.11/examples/persist/sqlapp/Department.java
rename to stasis-examples/src/main/java/com/example/persist/sqlapp/Department.java
diff --git a/je-7.5.11/examples/persist/sqlapp/Employee.java b/stasis-examples/src/main/java/com/example/persist/sqlapp/Employee.java
similarity index 100%
rename from je-7.5.11/examples/persist/sqlapp/Employee.java
rename to stasis-examples/src/main/java/com/example/persist/sqlapp/Employee.java
diff --git a/je-7.5.11/examples/persist/sqlapp/SQLApp.java b/stasis-examples/src/main/java/com/example/persist/sqlapp/SQLApp.java
similarity index 100%
rename from je-7.5.11/examples/persist/sqlapp/SQLApp.java
rename to stasis-examples/src/main/java/com/example/persist/sqlapp/SQLApp.java
diff --git a/je-7.5.11/examples/persist/txn/PayloadDataEntity.java b/stasis-examples/src/main/java/com/example/persist/txn/PayloadDataEntity.java
similarity index 100%
rename from je-7.5.11/examples/persist/txn/PayloadDataEntity.java
rename to stasis-examples/src/main/java/com/example/persist/txn/PayloadDataEntity.java
diff --git a/je-7.5.11/examples/persist/txn/StoreWriter.java b/stasis-examples/src/main/java/com/example/persist/txn/StoreWriter.java
similarity index 100%
rename from je-7.5.11/examples/persist/txn/StoreWriter.java
rename to stasis-examples/src/main/java/com/example/persist/txn/StoreWriter.java
diff --git a/je-7.5.11/examples/persist/txn/TxnGuideDPL.java b/stasis-examples/src/main/java/com/example/persist/txn/TxnGuideDPL.java
similarity index 100%
rename from je-7.5.11/examples/persist/txn/TxnGuideDPL.java
rename to stasis-examples/src/main/java/com/example/persist/txn/TxnGuideDPL.java
diff --git a/je-7.5.11/examples/resources/jboss/jndi.properties b/stasis-examples/src/main/java/com/example/resources/jboss/jndi.properties
similarity index 100%
rename from je-7.5.11/examples/resources/jboss/jndi.properties
rename to stasis-examples/src/main/java/com/example/resources/jboss/jndi.properties