diff --git a/lighthouse-core/computed/main-thread-tasks.js b/lighthouse-core/lib/tracehouse/main-thread-tasks.js
similarity index 100%
rename from lighthouse-core/computed/main-thread-tasks.js
rename to lighthouse-core/lib/tracehouse/main-thread-tasks.js
diff --git a/lighthouse-core/lib/task-groups.js b/lighthouse-core/lib/tracehouse/task-groups.js
similarity index 100%
rename from lighthouse-core/lib/task-groups.js
rename to lighthouse-core/lib/tracehouse/task-groups.js
diff --git a/lighthouse-core/computed/trace-of-tab.js b/lighthouse-core/lib/tracehouse/trace-of-tab.js
similarity index 100%
rename from lighthouse-core/computed/trace-of-tab.js
rename to lighthouse-core/lib/tracehouse/trace-of-tab.js
diff --git a/lighthouse-core/lib/traces/tracing-processor.js b/lighthouse-core/lib/tracehouse/tracing-processor.js
similarity index 100%
rename from lighthouse-core/lib/traces/tracing-processor.js
rename to lighthouse-core/lib/tracehouse/tracing-processor.js
diff --git a/lighthouse-core/test/computed/main-thread-tasks-test.js b/lighthouse-core/test/lib/tracehouse/main-thread-tasks-test.js
similarity index 100%
rename from lighthouse-core/test/computed/main-thread-tasks-test.js
rename to lighthouse-core/test/lib/tracehouse/main-thread-tasks-test.js
diff --git a/lighthouse-core/test/computed/trace-of-tab-test.js b/lighthouse-core/test/lib/tracehouse/trace-of-tab-test.js
similarity index 100%
rename from lighthouse-core/test/computed/trace-of-tab-test.js
rename to lighthouse-core/test/lib/tracehouse/trace-of-tab-test.js
diff --git a/lighthouse-core/test/lib/traces/tracing-processor-test.js b/lighthouse-core/test/lib/tracehouse/tracing-processor-test.js
similarity index 100%
rename from lighthouse-core/test/lib/traces/tracing-processor-test.js
rename to lighthouse-core/test/lib/tracehouse/tracing-processor-test.js