diff --git a/Makefile.am b/Makefile.am
index ead84ead..5e547d1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ check_DATA =
 CLEANFILES = $(BUILT_SOURCES) $(check_DATA)
 EXTRA_DIST =
 
-AM_CPPFLAGS = -I$(srcdir)/..
+AM_CPPFLAGS = -I$(srcdir)/src -I$(builddir)/src
 AM_CFLAGS = -fno-exceptions \
 	    -fno-strict-aliasing \
 	    -Wall \
@@ -55,196 +55,203 @@ TESTS = run_unittests_as_user run_unittests_as_root
 EXTRA_DIST += $(TESTS)
 
 update_engine_LDADD = libupdate_engine.a $(LDADD)
-update_engine_SOURCES = main.cc \
-			update_engine.dbusserver.h
+update_engine_SOURCES = src/update_engine/main.cc \
+			src/update_engine/update_engine.dbusserver.h
 
 delta_generator_LDADD = libupdate_engine.a $(LDADD)
 delta_generator_SOURCES = generate_delta_main.cc
 
 update_engine_client_LDADD = libupdate_engine.a $(LDADD)
-update_engine_client_SOURCES = update_engine_client.cc \
-			       update_engine.dbusclient.h
+update_engine_client_SOURCES = src/update_engine/update_engine_client.cc \
+			       src/update_engine/update_engine.dbusclient.h
 
 libupdate_engine_a_SOURCES = \
-	action.h \
-	action_pipe.h \
-	action_processor.cc \
-	action_processor.h \
-	bzip.cc \
-	bzip.h \
-	bzip_extent_writer.cc \
-	bzip_extent_writer.h \
-	certificate_checker.cc \
-	certificate_checker.h \
-	cycle_breaker.cc \
-	cycle_breaker.h \
-	dbus_constants.h \
-	dbus_interface.h \
-	dbus_service.cc \
-	dbus_service.h \
-	delta_diff_generator.cc \
-	delta_diff_generator.h \
-	delta_performer.cc \
-	delta_performer.h \
-	download_action.cc \
-	download_action.h \
-	extent_mapper.cc \
-	extent_mapper.h \
-	extent_ranges.cc \
-	extent_ranges.h \
-	extent_writer.cc \
-	extent_writer.h \
-	file_writer.cc \
-	file_writer.h \
-	filesystem_copier_action.cc \
-	filesystem_copier_action.h \
-	filesystem_iterator.cc \
-	filesystem_iterator.h \
-	full_update_generator.cc \
-	full_update_generator.h \
-	graph_types.h \
-	graph_utils.cc \
-	graph_utils.h \
-	http_common.cc \
-	http_common.h \
-	http_fetcher.cc \
-	http_fetcher.h \
-	install_plan.cc \
-	install_plan.h \
-	libcurl_http_fetcher.cc \
-	libcurl_http_fetcher.h \
-	marshal.glibmarshal.c \
-	marshal.glibmarshal.h \
-	metadata.cc \
-	metadata.h \
-	multi_range_http_fetcher.cc \
-	multi_range_http_fetcher.h \
-	omaha_hash_calculator.cc \
-	omaha_hash_calculator.h \
-	omaha_request_action.cc \
-	omaha_request_action.h \
-	omaha_request_params.cc \
-	omaha_request_params.h \
-	omaha_response.h \
-	omaha_response_handler_action.cc \
-	omaha_response_handler_action.h \
-	payload_signer.cc \
-	payload_signer.h \
-	payload_state.cc \
-	payload_state.h \
-	payload_state_interface.h \
-	postinstall_runner_action.cc \
-	postinstall_runner_action.h \
-	prefs.cc \
-	prefs.h \
-	prefs_interface.h \
-	real_system_state.h \
-	simple_key_value_store.cc \
-	simple_key_value_store.h \
-	subprocess.cc \
-	subprocess.h \
-	system_state.cc \
-	system_state.h \
-	tarjan.cc \
-	tarjan.h \
-	terminator.cc \
-	terminator.h \
-	topological_sort.cc \
-	topological_sort.h \
-	update_attempter.cc \
-	update_attempter.h \
-	update_check_scheduler.cc \
-	update_check_scheduler.h \
-	update_metadata.pb.cc \
-	update_metadata.pb.h \
-	utils.cc \
-	utils.h
+	src/update_engine/action.h \
+	src/update_engine/action_pipe.h \
+	src/update_engine/action_processor.cc \
+	src/update_engine/action_processor.h \
+	src/update_engine/bzip.cc \
+	src/update_engine/bzip.h \
+	src/update_engine/bzip_extent_writer.cc \
+	src/update_engine/bzip_extent_writer.h \
+	src/update_engine/certificate_checker.cc \
+	src/update_engine/certificate_checker.h \
+	src/update_engine/cycle_breaker.cc \
+	src/update_engine/cycle_breaker.h \
+	src/update_engine/dbus_constants.h \
+	src/update_engine/dbus_interface.h \
+	src/update_engine/dbus_service.cc \
+	src/update_engine/dbus_service.h \
+	src/update_engine/delta_diff_generator.cc \
+	src/update_engine/delta_diff_generator.h \
+	src/update_engine/delta_performer.cc \
+	src/update_engine/delta_performer.h \
+	src/update_engine/download_action.cc \
+	src/update_engine/download_action.h \
+	src/update_engine/extent_mapper.cc \
+	src/update_engine/extent_mapper.h \
+	src/update_engine/extent_ranges.cc \
+	src/update_engine/extent_ranges.h \
+	src/update_engine/extent_writer.cc \
+	src/update_engine/extent_writer.h \
+	src/update_engine/file_writer.cc \
+	src/update_engine/file_writer.h \
+	src/update_engine/filesystem_copier_action.cc \
+	src/update_engine/filesystem_copier_action.h \
+	src/update_engine/filesystem_iterator.cc \
+	src/update_engine/filesystem_iterator.h \
+	src/update_engine/full_update_generator.cc \
+	src/update_engine/full_update_generator.h \
+	src/update_engine/graph_types.h \
+	src/update_engine/graph_utils.cc \
+	src/update_engine/graph_utils.h \
+	src/update_engine/http_common.cc \
+	src/update_engine/http_common.h \
+	src/update_engine/http_fetcher.cc \
+	src/update_engine/http_fetcher.h \
+	src/update_engine/install_plan.cc \
+	src/update_engine/install_plan.h \
+	src/update_engine/libcurl_http_fetcher.cc \
+	src/update_engine/libcurl_http_fetcher.h \
+	src/update_engine/marshal.glibmarshal.c \
+	src/update_engine/marshal.glibmarshal.h \
+	src/update_engine/metadata.cc \
+	src/update_engine/metadata.h \
+	src/update_engine/multi_range_http_fetcher.cc \
+	src/update_engine/multi_range_http_fetcher.h \
+	src/update_engine/omaha_hash_calculator.cc \
+	src/update_engine/omaha_hash_calculator.h \
+	src/update_engine/omaha_request_action.cc \
+	src/update_engine/omaha_request_action.h \
+	src/update_engine/omaha_request_params.cc \
+	src/update_engine/omaha_request_params.h \
+	src/update_engine/omaha_response.h \
+	src/update_engine/omaha_response_handler_action.cc \
+	src/update_engine/omaha_response_handler_action.h \
+	src/update_engine/payload_signer.cc \
+	src/update_engine/payload_signer.h \
+	src/update_engine/payload_state.cc \
+	src/update_engine/payload_state.h \
+	src/update_engine/payload_state_interface.h \
+	src/update_engine/postinstall_runner_action.cc \
+	src/update_engine/postinstall_runner_action.h \
+	src/update_engine/prefs.cc \
+	src/update_engine/prefs.h \
+	src/update_engine/prefs_interface.h \
+	src/update_engine/real_system_state.h \
+	src/update_engine/simple_key_value_store.cc \
+	src/update_engine/simple_key_value_store.h \
+	src/update_engine/subprocess.cc \
+	src/update_engine/subprocess.h \
+	src/update_engine/system_state.cc \
+	src/update_engine/system_state.h \
+	src/update_engine/tarjan.cc \
+	src/update_engine/tarjan.h \
+	src/update_engine/terminator.cc \
+	src/update_engine/terminator.h \
+	src/update_engine/topological_sort.cc \
+	src/update_engine/topological_sort.h \
+	src/update_engine/update_attempter.cc \
+	src/update_engine/update_attempter.h \
+	src/update_engine/update_check_scheduler.cc \
+	src/update_engine/update_check_scheduler.h \
+	src/update_engine/update_metadata.pb.cc \
+	src/update_engine/update_metadata.pb.h \
+	src/update_engine/utils.cc \
+	src/update_engine/utils.h
 
 update_engine_unittests_LDADD = libupdate_engine.a \
 				-lgtest -lgmock $(LDADD)
 update_engine_unittests_SOURCES = \
-	testrunner.cc \
-	action_mock.h \
-	action_pipe_unittest.cc \
-	action_processor_mock.h \
-	action_processor_unittest.cc \
-	action_unittest.cc \
-	bzip_extent_writer_unittest.cc \
-	certificate_checker_mock.h \
-	certificate_checker_unittest.cc \
-	cycle_breaker_unittest.cc \
-	delta_diff_generator_unittest.cc \
-	delta_performer_unittest.cc \
-	download_action_unittest.cc \
-	extent_mapper_unittest.cc \
-	extent_ranges_unittest.cc \
-	extent_writer_unittest.cc \
-	file_writer_mock.h \
-	file_writer_unittest.cc \
-	filesystem_copier_action_unittest.cc \
-	filesystem_iterator_unittest.cc \
-	full_update_generator_unittest.cc \
-	graph_utils_unittest.cc \
-	http_fetcher_unittest.cc \
-	http_fetcher_unittest.h \
-	metadata_unittest.cc \
-	mock_dbus_interface.h \
-	mock_file_writer.h \
-	mock_http_fetcher.cc \
-	mock_http_fetcher.h \
-	mock_payload_state.h \
-	mock_system_state.cc \
-	mock_system_state.h \
-	omaha_hash_calculator_unittest.cc \
-	omaha_request_action_unittest.cc \
-	omaha_request_params_unittest.cc \
-	omaha_response_handler_action_unittest.cc \
-	payload_signer_unittest.cc \
-	payload_state_unittest.cc \
-	postinstall_runner_action_unittest.cc \
-	prefs_mock.h \
-	prefs_unittest.cc \
-	simple_key_value_store_unittest.cc \
-	subprocess_unittest.cc \
-	tarjan_unittest.cc \
-	terminator_unittest.cc \
-	test_utils.cc \
-	test_utils.h \
-	topological_sort_unittest.cc \
-	update_attempter_mock.h \
-	update_attempter_unittest.cc \
-	update_check_scheduler_unittest.cc \
-	utils_unittest.cc \
-	zip_unittest.cc
+	src/update_engine/testrunner.cc \
+	src/update_engine/action_mock.h \
+	src/update_engine/action_pipe_unittest.cc \
+	src/update_engine/action_processor_mock.h \
+	src/update_engine/action_processor_unittest.cc \
+	src/update_engine/action_unittest.cc \
+	src/update_engine/bzip_extent_writer_unittest.cc \
+	src/update_engine/certificate_checker_mock.h \
+	src/update_engine/certificate_checker_unittest.cc \
+	src/update_engine/cycle_breaker_unittest.cc \
+	src/update_engine/delta_diff_generator_unittest.cc \
+	src/update_engine/delta_performer_unittest.cc \
+	src/update_engine/download_action_unittest.cc \
+	src/update_engine/extent_mapper_unittest.cc \
+	src/update_engine/extent_ranges_unittest.cc \
+	src/update_engine/extent_writer_unittest.cc \
+	src/update_engine/file_writer_mock.h \
+	src/update_engine/file_writer_unittest.cc \
+	src/update_engine/filesystem_copier_action_unittest.cc \
+	src/update_engine/filesystem_iterator_unittest.cc \
+	src/update_engine/full_update_generator_unittest.cc \
+	src/update_engine/graph_utils_unittest.cc \
+	src/update_engine/http_fetcher_unittest.cc \
+	src/update_engine/http_fetcher_unittest.h \
+	src/update_engine/metadata_unittest.cc \
+	src/update_engine/mock_dbus_interface.h \
+	src/update_engine/mock_file_writer.h \
+	src/update_engine/mock_http_fetcher.cc \
+	src/update_engine/mock_http_fetcher.h \
+	src/update_engine/mock_payload_state.h \
+	src/update_engine/mock_system_state.cc \
+	src/update_engine/mock_system_state.h \
+	src/update_engine/omaha_hash_calculator_unittest.cc \
+	src/update_engine/omaha_request_action_unittest.cc \
+	src/update_engine/omaha_request_params_unittest.cc \
+	src/update_engine/omaha_response_handler_action_unittest.cc \
+	src/update_engine/payload_signer_unittest.cc \
+	src/update_engine/payload_state_unittest.cc \
+	src/update_engine/postinstall_runner_action_unittest.cc \
+	src/update_engine/prefs_mock.h \
+	src/update_engine/prefs_unittest.cc \
+	src/update_engine/simple_key_value_store_unittest.cc \
+	src/update_engine/subprocess_unittest.cc \
+	src/update_engine/tarjan_unittest.cc \
+	src/update_engine/terminator_unittest.cc \
+	src/update_engine/test_utils.cc \
+	src/update_engine/test_utils.h \
+	src/update_engine/topological_sort_unittest.cc \
+	src/update_engine/update_attempter_mock.h \
+	src/update_engine/update_attempter_unittest.cc \
+	src/update_engine/update_check_scheduler_unittest.cc \
+	src/update_engine/utils_unittest.cc \
+	src/update_engine/zip_unittest.cc
 
 test_http_server_SOURCES = \
-	test_http_server.cc \
-	http_common.cc \
-	http_common.h \
-	http_fetcher_unittest.h
+	src/update_engine/test_http_server.cc \
+	src/update_engine/http_common.cc \
+	src/update_engine/http_common.h \
+	src/update_engine/http_fetcher_unittest.h
 
-EXTRA_DIST += marshal.list
-BUILT_SOURCES += marshal.glibmarshal.c marshal.glibmarshal.h
+EXTRA_DIST += src/update_engine/marshal.list
+BUILT_SOURCES += src/update_engine/marshal.glibmarshal.c \
+		 src/update_engine/marshal.glibmarshal.h
 %.glibmarshal.c: %.list
+	$(AM_V_at) $(MKDIR_P) $(dir $@)
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --body \
 	    --prefix=update_engine $< > $@
 
 %.glibmarshal.h: %.list
+	$(AM_V_at) $(MKDIR_P) $(dir $@)
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --header \
 	    --prefix=update_engine $< > $@
 
-EXTRA_DIST += update_engine.xml
-BUILT_SOURCES += update_engine.dbusclient.h update_engine.dbusserver.h
+EXTRA_DIST += src/update_engine/update_engine.xml
+BUILT_SOURCES += src/update_engine/update_engine.dbusclient.h \
+		 src/update_engine/update_engine.dbusserver.h
 %.dbusclient.h: %.xml
+	$(AM_V_at) $(MKDIR_P) $(dir $@)
 	$(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-client \
 	    --prefix=update_engine_service $< > $@
 
 %.dbusserver.h: %.xml
+	$(AM_V_at) $(MKDIR_P) $(dir $@)
 	$(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-server \
 	    --prefix=update_engine_service $< > $@
 
-EXTRA_DIST += update_metadata.proto
-BUILT_SOURCES += update_metadata.pb.cc update_metadata.pb.h
+EXTRA_DIST += src/update_engine/update_metadata.proto
+BUILT_SOURCES += src/update_engine/update_metadata.pb.cc \
+		 src/update_engine/update_metadata.pb.h
 %.pb.cc %.pb.h: %.proto
 	$(AM_V_GEN) $(PROTOC) --proto_path=$(srcdir) --cpp_out=$(builddir) $<
 
@@ -252,6 +259,7 @@ BUILT_SOURCES += update_metadata.pb.cc update_metadata.pb.h
 EXTRA_DIST += unittest_key.pem unittest_key2.pem
 check_DATA += unittest_key.pub.pem unittest_key2.pub.pem
 %.pub.pem: %.pem
+	$(AM_V_at) $(MKDIR_P) $(dir $@)
 	$(AM_V_GEN) openssl rsa -in $< -pubout -out $@
 
 # TODO: revisit how to generate useful coverage data or re-add lcov to
diff --git a/configure.ac b/configure.ac
index bc206d43..8d0a9050 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ([2.69])
 AC_INIT([update_engine],[0.1.0],[https://github.com/coreos/bugs/issues])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_SRCDIR([main.cc])
+AC_CONFIG_SRCDIR([src/update_engine/main.cc])
 
 AM_INIT_AUTOMAKE([foreign 1.13 -Wall -Wno-portability silent-rules serial-tests])
 AM_SILENT_RULES([yes])
@@ -12,6 +12,7 @@ AM_SILENT_RULES([yes])
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_MKDIR_P
 AC_PROG_RANLIB
 AM_PROG_AR
 
diff --git a/run_unittests_as_root b/run_unittests_as_root
index aea2e6fc..a725e237 100755
--- a/run_unittests_as_root
+++ b/run_unittests_as_root
@@ -9,4 +9,20 @@ if [[ "$(id -u)" -ne 0 ]]; then
         exit 77
     fi
 fi
+
+if ! [[ -f unittest_key.pub.pem || -f unittest_key2.pub.pem ]]; then
+    echo "ERROR: tests much run in the build output directory" >&2
+    exit 99
+fi
+
+# If running in an out-of-tree build grab the private test keys
+if ! [[ -f unittest_key.pem && -f unittest_key2.pem ]]; then
+    srcdir="$(dirname "$0")"
+    cp "${srcdir}/unittest_key.pem" "${srcdir}/unittest_key2.pem" ./
+    if [[ $? -ne 0 ]]; then
+        echo "ERROR: failed to copy private test keys to build directory" >&2
+        exit 99
+    fi
+fi
+
 $sudo ./update_engine_unittests --gtest_filter='*.RunAsRoot*'
diff --git a/run_unittests_as_user b/run_unittests_as_user
index d202714b..b91e03e6 100755
--- a/run_unittests_as_user
+++ b/run_unittests_as_user
@@ -1,3 +1,18 @@
 #!/bin/bash
 
+if ! [[ -f unittest_key.pub.pem || -f unittest_key2.pub.pem ]]; then
+    echo "ERROR: tests much run in the build output directory" >&2
+    exit 99
+fi
+
+# If running in an out-of-tree build grab the private test keys
+if ! [[ -f unittest_key.pem && -f unittest_key2.pem ]]; then
+    srcdir="$(dirname "$0")"
+    cp "${srcdir}/unittest_key.pem" "${srcdir}/unittest_key2.pem" ./
+    if [[ $? -ne 0 ]]; then
+        echo "ERROR: failed to copy private test keys to build directory" >&2
+        exit 99
+    fi
+fi
+
 ./update_engine_unittests --gtest_filter='-*.RunAsRoot*'
diff --git a/action.h b/src/update_engine/action.h
similarity index 100%
rename from action.h
rename to src/update_engine/action.h
diff --git a/action_mock.h b/src/update_engine/action_mock.h
similarity index 100%
rename from action_mock.h
rename to src/update_engine/action_mock.h
diff --git a/action_pipe.h b/src/update_engine/action_pipe.h
similarity index 100%
rename from action_pipe.h
rename to src/update_engine/action_pipe.h
diff --git a/action_pipe_unittest.cc b/src/update_engine/action_pipe_unittest.cc
similarity index 100%
rename from action_pipe_unittest.cc
rename to src/update_engine/action_pipe_unittest.cc
diff --git a/action_processor.cc b/src/update_engine/action_processor.cc
similarity index 100%
rename from action_processor.cc
rename to src/update_engine/action_processor.cc
diff --git a/action_processor.h b/src/update_engine/action_processor.h
similarity index 100%
rename from action_processor.h
rename to src/update_engine/action_processor.h
diff --git a/action_processor_mock.h b/src/update_engine/action_processor_mock.h
similarity index 100%
rename from action_processor_mock.h
rename to src/update_engine/action_processor_mock.h
diff --git a/action_processor_unittest.cc b/src/update_engine/action_processor_unittest.cc
similarity index 100%
rename from action_processor_unittest.cc
rename to src/update_engine/action_processor_unittest.cc
diff --git a/action_unittest.cc b/src/update_engine/action_unittest.cc
similarity index 100%
rename from action_unittest.cc
rename to src/update_engine/action_unittest.cc
diff --git a/bzip.cc b/src/update_engine/bzip.cc
similarity index 100%
rename from bzip.cc
rename to src/update_engine/bzip.cc
diff --git a/bzip.h b/src/update_engine/bzip.h
similarity index 100%
rename from bzip.h
rename to src/update_engine/bzip.h
diff --git a/bzip_extent_writer.cc b/src/update_engine/bzip_extent_writer.cc
similarity index 100%
rename from bzip_extent_writer.cc
rename to src/update_engine/bzip_extent_writer.cc
diff --git a/bzip_extent_writer.h b/src/update_engine/bzip_extent_writer.h
similarity index 100%
rename from bzip_extent_writer.h
rename to src/update_engine/bzip_extent_writer.h
diff --git a/bzip_extent_writer_unittest.cc b/src/update_engine/bzip_extent_writer_unittest.cc
similarity index 100%
rename from bzip_extent_writer_unittest.cc
rename to src/update_engine/bzip_extent_writer_unittest.cc
diff --git a/certificate_checker.cc b/src/update_engine/certificate_checker.cc
similarity index 100%
rename from certificate_checker.cc
rename to src/update_engine/certificate_checker.cc
diff --git a/certificate_checker.h b/src/update_engine/certificate_checker.h
similarity index 100%
rename from certificate_checker.h
rename to src/update_engine/certificate_checker.h
diff --git a/certificate_checker_mock.h b/src/update_engine/certificate_checker_mock.h
similarity index 100%
rename from certificate_checker_mock.h
rename to src/update_engine/certificate_checker_mock.h
diff --git a/certificate_checker_unittest.cc b/src/update_engine/certificate_checker_unittest.cc
similarity index 100%
rename from certificate_checker_unittest.cc
rename to src/update_engine/certificate_checker_unittest.cc
diff --git a/cycle_breaker.cc b/src/update_engine/cycle_breaker.cc
similarity index 100%
rename from cycle_breaker.cc
rename to src/update_engine/cycle_breaker.cc
diff --git a/cycle_breaker.h b/src/update_engine/cycle_breaker.h
similarity index 100%
rename from cycle_breaker.h
rename to src/update_engine/cycle_breaker.h
diff --git a/cycle_breaker_unittest.cc b/src/update_engine/cycle_breaker_unittest.cc
similarity index 100%
rename from cycle_breaker_unittest.cc
rename to src/update_engine/cycle_breaker_unittest.cc
diff --git a/dbus_constants.h b/src/update_engine/dbus_constants.h
similarity index 100%
rename from dbus_constants.h
rename to src/update_engine/dbus_constants.h
diff --git a/dbus_interface.h b/src/update_engine/dbus_interface.h
similarity index 100%
rename from dbus_interface.h
rename to src/update_engine/dbus_interface.h
diff --git a/dbus_service.cc b/src/update_engine/dbus_service.cc
similarity index 100%
rename from dbus_service.cc
rename to src/update_engine/dbus_service.cc
diff --git a/dbus_service.h b/src/update_engine/dbus_service.h
similarity index 100%
rename from dbus_service.h
rename to src/update_engine/dbus_service.h
diff --git a/delta_diff_generator.cc b/src/update_engine/delta_diff_generator.cc
similarity index 100%
rename from delta_diff_generator.cc
rename to src/update_engine/delta_diff_generator.cc
diff --git a/delta_diff_generator.h b/src/update_engine/delta_diff_generator.h
similarity index 100%
rename from delta_diff_generator.h
rename to src/update_engine/delta_diff_generator.h
diff --git a/delta_diff_generator_unittest.cc b/src/update_engine/delta_diff_generator_unittest.cc
similarity index 100%
rename from delta_diff_generator_unittest.cc
rename to src/update_engine/delta_diff_generator_unittest.cc
diff --git a/delta_performer.cc b/src/update_engine/delta_performer.cc
similarity index 100%
rename from delta_performer.cc
rename to src/update_engine/delta_performer.cc
diff --git a/delta_performer.h b/src/update_engine/delta_performer.h
similarity index 100%
rename from delta_performer.h
rename to src/update_engine/delta_performer.h
diff --git a/delta_performer_unittest.cc b/src/update_engine/delta_performer_unittest.cc
similarity index 100%
rename from delta_performer_unittest.cc
rename to src/update_engine/delta_performer_unittest.cc
diff --git a/download_action.cc b/src/update_engine/download_action.cc
similarity index 100%
rename from download_action.cc
rename to src/update_engine/download_action.cc
diff --git a/download_action.h b/src/update_engine/download_action.h
similarity index 100%
rename from download_action.h
rename to src/update_engine/download_action.h
diff --git a/download_action_unittest.cc b/src/update_engine/download_action_unittest.cc
similarity index 100%
rename from download_action_unittest.cc
rename to src/update_engine/download_action_unittest.cc
diff --git a/extent_mapper.cc b/src/update_engine/extent_mapper.cc
similarity index 100%
rename from extent_mapper.cc
rename to src/update_engine/extent_mapper.cc
diff --git a/extent_mapper.h b/src/update_engine/extent_mapper.h
similarity index 100%
rename from extent_mapper.h
rename to src/update_engine/extent_mapper.h
diff --git a/extent_mapper_unittest.cc b/src/update_engine/extent_mapper_unittest.cc
similarity index 100%
rename from extent_mapper_unittest.cc
rename to src/update_engine/extent_mapper_unittest.cc
diff --git a/extent_ranges.cc b/src/update_engine/extent_ranges.cc
similarity index 100%
rename from extent_ranges.cc
rename to src/update_engine/extent_ranges.cc
diff --git a/extent_ranges.h b/src/update_engine/extent_ranges.h
similarity index 100%
rename from extent_ranges.h
rename to src/update_engine/extent_ranges.h
diff --git a/extent_ranges_unittest.cc b/src/update_engine/extent_ranges_unittest.cc
similarity index 100%
rename from extent_ranges_unittest.cc
rename to src/update_engine/extent_ranges_unittest.cc
diff --git a/extent_writer.cc b/src/update_engine/extent_writer.cc
similarity index 100%
rename from extent_writer.cc
rename to src/update_engine/extent_writer.cc
diff --git a/extent_writer.h b/src/update_engine/extent_writer.h
similarity index 100%
rename from extent_writer.h
rename to src/update_engine/extent_writer.h
diff --git a/extent_writer_unittest.cc b/src/update_engine/extent_writer_unittest.cc
similarity index 100%
rename from extent_writer_unittest.cc
rename to src/update_engine/extent_writer_unittest.cc
diff --git a/file_writer.cc b/src/update_engine/file_writer.cc
similarity index 100%
rename from file_writer.cc
rename to src/update_engine/file_writer.cc
diff --git a/file_writer.h b/src/update_engine/file_writer.h
similarity index 100%
rename from file_writer.h
rename to src/update_engine/file_writer.h
diff --git a/file_writer_mock.h b/src/update_engine/file_writer_mock.h
similarity index 100%
rename from file_writer_mock.h
rename to src/update_engine/file_writer_mock.h
diff --git a/file_writer_unittest.cc b/src/update_engine/file_writer_unittest.cc
similarity index 100%
rename from file_writer_unittest.cc
rename to src/update_engine/file_writer_unittest.cc
diff --git a/filesystem_copier_action.cc b/src/update_engine/filesystem_copier_action.cc
similarity index 100%
rename from filesystem_copier_action.cc
rename to src/update_engine/filesystem_copier_action.cc
diff --git a/filesystem_copier_action.h b/src/update_engine/filesystem_copier_action.h
similarity index 100%
rename from filesystem_copier_action.h
rename to src/update_engine/filesystem_copier_action.h
diff --git a/filesystem_copier_action_unittest.cc b/src/update_engine/filesystem_copier_action_unittest.cc
similarity index 100%
rename from filesystem_copier_action_unittest.cc
rename to src/update_engine/filesystem_copier_action_unittest.cc
diff --git a/filesystem_iterator.cc b/src/update_engine/filesystem_iterator.cc
similarity index 100%
rename from filesystem_iterator.cc
rename to src/update_engine/filesystem_iterator.cc
diff --git a/filesystem_iterator.h b/src/update_engine/filesystem_iterator.h
similarity index 100%
rename from filesystem_iterator.h
rename to src/update_engine/filesystem_iterator.h
diff --git a/filesystem_iterator_unittest.cc b/src/update_engine/filesystem_iterator_unittest.cc
similarity index 100%
rename from filesystem_iterator_unittest.cc
rename to src/update_engine/filesystem_iterator_unittest.cc
diff --git a/full_update_generator.cc b/src/update_engine/full_update_generator.cc
similarity index 100%
rename from full_update_generator.cc
rename to src/update_engine/full_update_generator.cc
diff --git a/full_update_generator.h b/src/update_engine/full_update_generator.h
similarity index 100%
rename from full_update_generator.h
rename to src/update_engine/full_update_generator.h
diff --git a/full_update_generator_unittest.cc b/src/update_engine/full_update_generator_unittest.cc
similarity index 100%
rename from full_update_generator_unittest.cc
rename to src/update_engine/full_update_generator_unittest.cc
diff --git a/generate_delta_main.cc b/src/update_engine/generate_delta_main.cc
similarity index 100%
rename from generate_delta_main.cc
rename to src/update_engine/generate_delta_main.cc
diff --git a/graph_types.h b/src/update_engine/graph_types.h
similarity index 100%
rename from graph_types.h
rename to src/update_engine/graph_types.h
diff --git a/graph_utils.cc b/src/update_engine/graph_utils.cc
similarity index 100%
rename from graph_utils.cc
rename to src/update_engine/graph_utils.cc
diff --git a/graph_utils.h b/src/update_engine/graph_utils.h
similarity index 100%
rename from graph_utils.h
rename to src/update_engine/graph_utils.h
diff --git a/graph_utils_unittest.cc b/src/update_engine/graph_utils_unittest.cc
similarity index 100%
rename from graph_utils_unittest.cc
rename to src/update_engine/graph_utils_unittest.cc
diff --git a/http_common.cc b/src/update_engine/http_common.cc
similarity index 100%
rename from http_common.cc
rename to src/update_engine/http_common.cc
diff --git a/http_common.h b/src/update_engine/http_common.h
similarity index 100%
rename from http_common.h
rename to src/update_engine/http_common.h
diff --git a/http_fetcher.cc b/src/update_engine/http_fetcher.cc
similarity index 100%
rename from http_fetcher.cc
rename to src/update_engine/http_fetcher.cc
diff --git a/http_fetcher.h b/src/update_engine/http_fetcher.h
similarity index 100%
rename from http_fetcher.h
rename to src/update_engine/http_fetcher.h
diff --git a/http_fetcher_unittest.cc b/src/update_engine/http_fetcher_unittest.cc
similarity index 100%
rename from http_fetcher_unittest.cc
rename to src/update_engine/http_fetcher_unittest.cc
diff --git a/http_fetcher_unittest.h b/src/update_engine/http_fetcher_unittest.h
similarity index 100%
rename from http_fetcher_unittest.h
rename to src/update_engine/http_fetcher_unittest.h
diff --git a/install_plan.cc b/src/update_engine/install_plan.cc
similarity index 100%
rename from install_plan.cc
rename to src/update_engine/install_plan.cc
diff --git a/install_plan.h b/src/update_engine/install_plan.h
similarity index 100%
rename from install_plan.h
rename to src/update_engine/install_plan.h
diff --git a/libcurl_http_fetcher.cc b/src/update_engine/libcurl_http_fetcher.cc
similarity index 100%
rename from libcurl_http_fetcher.cc
rename to src/update_engine/libcurl_http_fetcher.cc
diff --git a/libcurl_http_fetcher.h b/src/update_engine/libcurl_http_fetcher.h
similarity index 100%
rename from libcurl_http_fetcher.h
rename to src/update_engine/libcurl_http_fetcher.h
diff --git a/main.cc b/src/update_engine/main.cc
similarity index 100%
rename from main.cc
rename to src/update_engine/main.cc
diff --git a/marshal.list b/src/update_engine/marshal.list
similarity index 100%
rename from marshal.list
rename to src/update_engine/marshal.list
diff --git a/metadata.cc b/src/update_engine/metadata.cc
similarity index 100%
rename from metadata.cc
rename to src/update_engine/metadata.cc
diff --git a/metadata.h b/src/update_engine/metadata.h
similarity index 100%
rename from metadata.h
rename to src/update_engine/metadata.h
diff --git a/metadata_unittest.cc b/src/update_engine/metadata_unittest.cc
similarity index 100%
rename from metadata_unittest.cc
rename to src/update_engine/metadata_unittest.cc
diff --git a/mock_dbus_interface.h b/src/update_engine/mock_dbus_interface.h
similarity index 100%
rename from mock_dbus_interface.h
rename to src/update_engine/mock_dbus_interface.h
diff --git a/mock_file_writer.h b/src/update_engine/mock_file_writer.h
similarity index 100%
rename from mock_file_writer.h
rename to src/update_engine/mock_file_writer.h
diff --git a/mock_http_fetcher.cc b/src/update_engine/mock_http_fetcher.cc
similarity index 100%
rename from mock_http_fetcher.cc
rename to src/update_engine/mock_http_fetcher.cc
diff --git a/mock_http_fetcher.h b/src/update_engine/mock_http_fetcher.h
similarity index 100%
rename from mock_http_fetcher.h
rename to src/update_engine/mock_http_fetcher.h
diff --git a/mock_payload_state.h b/src/update_engine/mock_payload_state.h
similarity index 100%
rename from mock_payload_state.h
rename to src/update_engine/mock_payload_state.h
diff --git a/mock_system_state.cc b/src/update_engine/mock_system_state.cc
similarity index 100%
rename from mock_system_state.cc
rename to src/update_engine/mock_system_state.cc
diff --git a/mock_system_state.h b/src/update_engine/mock_system_state.h
similarity index 100%
rename from mock_system_state.h
rename to src/update_engine/mock_system_state.h
diff --git a/multi_range_http_fetcher.cc b/src/update_engine/multi_range_http_fetcher.cc
similarity index 100%
rename from multi_range_http_fetcher.cc
rename to src/update_engine/multi_range_http_fetcher.cc
diff --git a/multi_range_http_fetcher.h b/src/update_engine/multi_range_http_fetcher.h
similarity index 100%
rename from multi_range_http_fetcher.h
rename to src/update_engine/multi_range_http_fetcher.h
diff --git a/omaha_hash_calculator.cc b/src/update_engine/omaha_hash_calculator.cc
similarity index 100%
rename from omaha_hash_calculator.cc
rename to src/update_engine/omaha_hash_calculator.cc
diff --git a/omaha_hash_calculator.h b/src/update_engine/omaha_hash_calculator.h
similarity index 100%
rename from omaha_hash_calculator.h
rename to src/update_engine/omaha_hash_calculator.h
diff --git a/omaha_hash_calculator_unittest.cc b/src/update_engine/omaha_hash_calculator_unittest.cc
similarity index 100%
rename from omaha_hash_calculator_unittest.cc
rename to src/update_engine/omaha_hash_calculator_unittest.cc
diff --git a/omaha_request_action.cc b/src/update_engine/omaha_request_action.cc
similarity index 100%
rename from omaha_request_action.cc
rename to src/update_engine/omaha_request_action.cc
diff --git a/omaha_request_action.h b/src/update_engine/omaha_request_action.h
similarity index 100%
rename from omaha_request_action.h
rename to src/update_engine/omaha_request_action.h
diff --git a/omaha_request_action_unittest.cc b/src/update_engine/omaha_request_action_unittest.cc
similarity index 100%
rename from omaha_request_action_unittest.cc
rename to src/update_engine/omaha_request_action_unittest.cc
diff --git a/omaha_request_params.cc b/src/update_engine/omaha_request_params.cc
similarity index 100%
rename from omaha_request_params.cc
rename to src/update_engine/omaha_request_params.cc
diff --git a/omaha_request_params.h b/src/update_engine/omaha_request_params.h
similarity index 100%
rename from omaha_request_params.h
rename to src/update_engine/omaha_request_params.h
diff --git a/omaha_request_params_unittest.cc b/src/update_engine/omaha_request_params_unittest.cc
similarity index 100%
rename from omaha_request_params_unittest.cc
rename to src/update_engine/omaha_request_params_unittest.cc
diff --git a/omaha_response.h b/src/update_engine/omaha_response.h
similarity index 100%
rename from omaha_response.h
rename to src/update_engine/omaha_response.h
diff --git a/omaha_response_handler_action.cc b/src/update_engine/omaha_response_handler_action.cc
similarity index 100%
rename from omaha_response_handler_action.cc
rename to src/update_engine/omaha_response_handler_action.cc
diff --git a/omaha_response_handler_action.h b/src/update_engine/omaha_response_handler_action.h
similarity index 100%
rename from omaha_response_handler_action.h
rename to src/update_engine/omaha_response_handler_action.h
diff --git a/omaha_response_handler_action_unittest.cc b/src/update_engine/omaha_response_handler_action_unittest.cc
similarity index 100%
rename from omaha_response_handler_action_unittest.cc
rename to src/update_engine/omaha_response_handler_action_unittest.cc
diff --git a/payload_signer.cc b/src/update_engine/payload_signer.cc
similarity index 100%
rename from payload_signer.cc
rename to src/update_engine/payload_signer.cc
diff --git a/payload_signer.h b/src/update_engine/payload_signer.h
similarity index 100%
rename from payload_signer.h
rename to src/update_engine/payload_signer.h
diff --git a/payload_signer_unittest.cc b/src/update_engine/payload_signer_unittest.cc
similarity index 100%
rename from payload_signer_unittest.cc
rename to src/update_engine/payload_signer_unittest.cc
diff --git a/payload_state.cc b/src/update_engine/payload_state.cc
similarity index 100%
rename from payload_state.cc
rename to src/update_engine/payload_state.cc
diff --git a/payload_state.h b/src/update_engine/payload_state.h
similarity index 100%
rename from payload_state.h
rename to src/update_engine/payload_state.h
diff --git a/payload_state_interface.h b/src/update_engine/payload_state_interface.h
similarity index 100%
rename from payload_state_interface.h
rename to src/update_engine/payload_state_interface.h
diff --git a/payload_state_unittest.cc b/src/update_engine/payload_state_unittest.cc
similarity index 100%
rename from payload_state_unittest.cc
rename to src/update_engine/payload_state_unittest.cc
diff --git a/postinstall_runner_action.cc b/src/update_engine/postinstall_runner_action.cc
similarity index 100%
rename from postinstall_runner_action.cc
rename to src/update_engine/postinstall_runner_action.cc
diff --git a/postinstall_runner_action.h b/src/update_engine/postinstall_runner_action.h
similarity index 100%
rename from postinstall_runner_action.h
rename to src/update_engine/postinstall_runner_action.h
diff --git a/postinstall_runner_action_unittest.cc b/src/update_engine/postinstall_runner_action_unittest.cc
similarity index 100%
rename from postinstall_runner_action_unittest.cc
rename to src/update_engine/postinstall_runner_action_unittest.cc
diff --git a/prefs.cc b/src/update_engine/prefs.cc
similarity index 100%
rename from prefs.cc
rename to src/update_engine/prefs.cc
diff --git a/prefs.h b/src/update_engine/prefs.h
similarity index 100%
rename from prefs.h
rename to src/update_engine/prefs.h
diff --git a/prefs_interface.h b/src/update_engine/prefs_interface.h
similarity index 100%
rename from prefs_interface.h
rename to src/update_engine/prefs_interface.h
diff --git a/prefs_mock.h b/src/update_engine/prefs_mock.h
similarity index 100%
rename from prefs_mock.h
rename to src/update_engine/prefs_mock.h
diff --git a/prefs_unittest.cc b/src/update_engine/prefs_unittest.cc
similarity index 100%
rename from prefs_unittest.cc
rename to src/update_engine/prefs_unittest.cc
diff --git a/real_system_state.h b/src/update_engine/real_system_state.h
similarity index 100%
rename from real_system_state.h
rename to src/update_engine/real_system_state.h
diff --git a/simple_key_value_store.cc b/src/update_engine/simple_key_value_store.cc
similarity index 100%
rename from simple_key_value_store.cc
rename to src/update_engine/simple_key_value_store.cc
diff --git a/simple_key_value_store.h b/src/update_engine/simple_key_value_store.h
similarity index 100%
rename from simple_key_value_store.h
rename to src/update_engine/simple_key_value_store.h
diff --git a/simple_key_value_store_unittest.cc b/src/update_engine/simple_key_value_store_unittest.cc
similarity index 100%
rename from simple_key_value_store_unittest.cc
rename to src/update_engine/simple_key_value_store_unittest.cc
diff --git a/subprocess.cc b/src/update_engine/subprocess.cc
similarity index 100%
rename from subprocess.cc
rename to src/update_engine/subprocess.cc
diff --git a/subprocess.h b/src/update_engine/subprocess.h
similarity index 100%
rename from subprocess.h
rename to src/update_engine/subprocess.h
diff --git a/subprocess_unittest.cc b/src/update_engine/subprocess_unittest.cc
similarity index 100%
rename from subprocess_unittest.cc
rename to src/update_engine/subprocess_unittest.cc
diff --git a/system_state.cc b/src/update_engine/system_state.cc
similarity index 100%
rename from system_state.cc
rename to src/update_engine/system_state.cc
diff --git a/system_state.h b/src/update_engine/system_state.h
similarity index 100%
rename from system_state.h
rename to src/update_engine/system_state.h
diff --git a/tarjan.cc b/src/update_engine/tarjan.cc
similarity index 100%
rename from tarjan.cc
rename to src/update_engine/tarjan.cc
diff --git a/tarjan.h b/src/update_engine/tarjan.h
similarity index 100%
rename from tarjan.h
rename to src/update_engine/tarjan.h
diff --git a/tarjan_unittest.cc b/src/update_engine/tarjan_unittest.cc
similarity index 100%
rename from tarjan_unittest.cc
rename to src/update_engine/tarjan_unittest.cc
diff --git a/terminator.cc b/src/update_engine/terminator.cc
similarity index 100%
rename from terminator.cc
rename to src/update_engine/terminator.cc
diff --git a/terminator.h b/src/update_engine/terminator.h
similarity index 100%
rename from terminator.h
rename to src/update_engine/terminator.h
diff --git a/terminator_unittest.cc b/src/update_engine/terminator_unittest.cc
similarity index 100%
rename from terminator_unittest.cc
rename to src/update_engine/terminator_unittest.cc
diff --git a/test_http_server.cc b/src/update_engine/test_http_server.cc
similarity index 100%
rename from test_http_server.cc
rename to src/update_engine/test_http_server.cc
diff --git a/test_utils.cc b/src/update_engine/test_utils.cc
similarity index 100%
rename from test_utils.cc
rename to src/update_engine/test_utils.cc
diff --git a/test_utils.h b/src/update_engine/test_utils.h
similarity index 100%
rename from test_utils.h
rename to src/update_engine/test_utils.h
diff --git a/testrunner.cc b/src/update_engine/testrunner.cc
similarity index 100%
rename from testrunner.cc
rename to src/update_engine/testrunner.cc
diff --git a/topological_sort.cc b/src/update_engine/topological_sort.cc
similarity index 100%
rename from topological_sort.cc
rename to src/update_engine/topological_sort.cc
diff --git a/topological_sort.h b/src/update_engine/topological_sort.h
similarity index 100%
rename from topological_sort.h
rename to src/update_engine/topological_sort.h
diff --git a/topological_sort_unittest.cc b/src/update_engine/topological_sort_unittest.cc
similarity index 100%
rename from topological_sort_unittest.cc
rename to src/update_engine/topological_sort_unittest.cc
diff --git a/update_attempter.cc b/src/update_engine/update_attempter.cc
similarity index 100%
rename from update_attempter.cc
rename to src/update_engine/update_attempter.cc
diff --git a/update_attempter.h b/src/update_engine/update_attempter.h
similarity index 100%
rename from update_attempter.h
rename to src/update_engine/update_attempter.h
diff --git a/update_attempter_mock.h b/src/update_engine/update_attempter_mock.h
similarity index 100%
rename from update_attempter_mock.h
rename to src/update_engine/update_attempter_mock.h
diff --git a/update_attempter_unittest.cc b/src/update_engine/update_attempter_unittest.cc
similarity index 100%
rename from update_attempter_unittest.cc
rename to src/update_engine/update_attempter_unittest.cc
diff --git a/update_check_scheduler.cc b/src/update_engine/update_check_scheduler.cc
similarity index 100%
rename from update_check_scheduler.cc
rename to src/update_engine/update_check_scheduler.cc
diff --git a/update_check_scheduler.h b/src/update_engine/update_check_scheduler.h
similarity index 100%
rename from update_check_scheduler.h
rename to src/update_engine/update_check_scheduler.h
diff --git a/update_check_scheduler_unittest.cc b/src/update_engine/update_check_scheduler_unittest.cc
similarity index 100%
rename from update_check_scheduler_unittest.cc
rename to src/update_engine/update_check_scheduler_unittest.cc
diff --git a/update_engine.xml b/src/update_engine/update_engine.xml
similarity index 100%
rename from update_engine.xml
rename to src/update_engine/update_engine.xml
diff --git a/update_engine_client.cc b/src/update_engine/update_engine_client.cc
similarity index 100%
rename from update_engine_client.cc
rename to src/update_engine/update_engine_client.cc
diff --git a/update_metadata.proto b/src/update_engine/update_metadata.proto
similarity index 100%
rename from update_metadata.proto
rename to src/update_engine/update_metadata.proto
diff --git a/utils.cc b/src/update_engine/utils.cc
similarity index 100%
rename from utils.cc
rename to src/update_engine/utils.cc
diff --git a/utils.h b/src/update_engine/utils.h
similarity index 100%
rename from utils.h
rename to src/update_engine/utils.h
diff --git a/utils_unittest.cc b/src/update_engine/utils_unittest.cc
similarity index 100%
rename from utils_unittest.cc
rename to src/update_engine/utils_unittest.cc
diff --git a/zip_unittest.cc b/src/update_engine/zip_unittest.cc
similarity index 100%
rename from zip_unittest.cc
rename to src/update_engine/zip_unittest.cc