diff --git a/src/main/scala/com/twitter/service/Json.scala b/src/main/scala/com/twitter/json/Json.scala
similarity index 84%
rename from src/main/scala/com/twitter/service/Json.scala
rename to src/main/scala/com/twitter/json/Json.scala
index 053b20b..b4f1742 100644
--- a/src/main/scala/com/twitter/service/Json.scala
+++ b/src/main/scala/com/twitter/json/Json.scala
@@ -1,5 +1,20 @@
-/** Copyright 2008 Twitter, Inc. */
-package com.twitter.service
+/*
+ * Copyright 2009 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.twitter.json
 
 import net.lag.extensions._
 import scala.collection.Map
diff --git a/src/test/scala/com/twitter/service/FilterableSpecsFileRunner.scala b/src/test/scala/com/twitter/json/FilterableSpecsFileRunner.scala
similarity index 100%
rename from src/test/scala/com/twitter/service/FilterableSpecsFileRunner.scala
rename to src/test/scala/com/twitter/json/FilterableSpecsFileRunner.scala
diff --git a/src/test/scala/com/twitter/service/JsonSpec.scala b/src/test/scala/com/twitter/json/JsonSpec.scala
similarity index 92%
rename from src/test/scala/com/twitter/service/JsonSpec.scala
rename to src/test/scala/com/twitter/json/JsonSpec.scala
index e5ec59e..460eff7 100644
--- a/src/test/scala/com/twitter/service/JsonSpec.scala
+++ b/src/test/scala/com/twitter/json/JsonSpec.scala
@@ -1,5 +1,20 @@
-/** Copyright 2008 Twitter, Inc. */
-package com.twitter.service
+/*
+ * Copyright 2009 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.twitter.json
 
 import net.lag.extensions._
 import org.specs._
diff --git a/src/test/scala/com/twitter/json/TestRunner.scala b/src/test/scala/com/twitter/json/TestRunner.scala
new file mode 100644
index 0000000..4a942b7
--- /dev/null
+++ b/src/test/scala/com/twitter/json/TestRunner.scala
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2009 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.twitter.json
+
+import net.lag.configgy.Configgy
+import org.specs.runner.SpecsFileRunner
+
+object TestRunner extends SpecsFileRunner("src/test/scala/**/*.scala", ".*",
+  System.getProperty("system", ".*"), System.getProperty("example", ".*"))
diff --git a/src/test/scala/com/twitter/service/TestRunner.scala b/src/test/scala/com/twitter/service/TestRunner.scala
deleted file mode 100644
index f1673e6..0000000
--- a/src/test/scala/com/twitter/service/TestRunner.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-/** Copyright 2008 Twitter, Inc. */
-package com.twitter.service
-
-import net.lag.configgy.Configgy
-import net.lag.logging.Logger
-import org.specs.runner.SpecsFileRunner
-
-object TestRunner extends SpecsFileRunner(
-  "src/test/scala/com/twitter/**/*.scala",
-  ".*",
-  System.getProperty("system", ".*"),
-  System.getProperty("example", ".*"))
-{
-  if (System.getProperty("debugtrace") == null) {
-    Logger.get("").setLevel(Logger.OFF)
-  }
-}