oops. everything goes under 'src'
diff --git a/DEPS b/src/DEPS
similarity index 100%
rename from DEPS
rename to src/DEPS
diff --git a/build/all.gyp b/src/build/all.gyp
similarity index 100%
rename from build/all.gyp
rename to src/build/all.gyp
diff --git a/build/build_util.gyp b/src/build/build_util.gyp
similarity index 100%
rename from build/build_util.gyp
rename to src/build/build_util.gyp
diff --git a/build/common.gypi b/src/build/common.gypi
similarity index 100%
rename from build/common.gypi
rename to src/build/common.gypi
diff --git a/build/compiler_version.py b/src/build/compiler_version.py
similarity index 100%
rename from build/compiler_version.py
rename to src/build/compiler_version.py
diff --git a/build/features_override.gypi b/src/build/features_override.gypi
similarity index 100%
rename from build/features_override.gypi
rename to src/build/features_override.gypi
diff --git a/build/gyp_chromium b/src/build/gyp_chromium
similarity index 100%
rename from build/gyp_chromium
rename to src/build/gyp_chromium
diff --git a/build/install.gyp b/src/build/install.gyp
similarity index 100%
rename from build/install.gyp
rename to src/build/install.gyp
diff --git a/build/output_dll_copy.rules b/src/build/output_dll_copy.rules
similarity index 100%
rename from build/output_dll_copy.rules
rename to src/build/output_dll_copy.rules
diff --git a/build/release.gypi b/src/build/release.gypi
similarity index 100%
rename from build/release.gypi
rename to src/build/release.gypi
diff --git a/build/version.py b/src/build/version.py
similarity index 100%
rename from build/version.py
rename to src/build/version.py
diff --git a/install/Makefile b/src/install/Makefile
similarity index 100%
rename from install/Makefile
rename to src/install/Makefile
diff --git a/install/centos.sh b/src/install/centos.sh
similarity index 100%
rename from install/centos.sh
rename to src/install/centos.sh
diff --git a/install/common/BRANDING b/src/install/common/BRANDING
similarity index 100%
rename from install/common/BRANDING
rename to src/install/common/BRANDING
diff --git a/install/common/apt.include b/src/install/common/apt.include
similarity index 100%
rename from install/common/apt.include
rename to src/install/common/apt.include
diff --git a/install/common/installer.include b/src/install/common/installer.include
similarity index 100%
rename from install/common/installer.include
rename to src/install/common/installer.include
diff --git a/install/common/mod-pagespeed/mod-pagespeed.info b/src/install/common/mod-pagespeed/mod-pagespeed.info
similarity index 100%
rename from install/common/mod-pagespeed/mod-pagespeed.info
rename to src/install/common/mod-pagespeed/mod-pagespeed.info
diff --git a/install/common/pagespeed.conf.template b/src/install/common/pagespeed.conf.template
similarity index 100%
rename from install/common/pagespeed.conf.template
rename to src/install/common/pagespeed.conf.template
diff --git a/install/common/pagespeed.load.template b/src/install/common/pagespeed.load.template
similarity index 100%
rename from install/common/pagespeed.load.template
rename to src/install/common/pagespeed.load.template
diff --git a/install/common/repo.cron b/src/install/common/repo.cron
similarity index 100%
rename from install/common/repo.cron
rename to src/install/common/repo.cron
diff --git a/install/common/rpm.include b/src/install/common/rpm.include
similarity index 100%
rename from install/common/rpm.include
rename to src/install/common/rpm.include
diff --git a/install/common/rpmrepo.cron b/src/install/common/rpmrepo.cron
similarity index 100%
rename from install/common/rpmrepo.cron
rename to src/install/common/rpmrepo.cron
diff --git a/install/common/updater b/src/install/common/updater
similarity index 100%
rename from install/common/updater
rename to src/install/common/updater
diff --git a/install/common/variables.include b/src/install/common/variables.include
similarity index 100%
rename from install/common/variables.include
rename to src/install/common/variables.include
diff --git a/install/debian/build.sh b/src/install/debian/build.sh
similarity index 100%
rename from install/debian/build.sh
rename to src/install/debian/build.sh
diff --git a/install/debian/changelog.template b/src/install/debian/changelog.template
similarity index 100%
rename from install/debian/changelog.template
rename to src/install/debian/changelog.template
diff --git a/install/debian/conffiles b/src/install/debian/conffiles
similarity index 100%
rename from install/debian/conffiles
rename to src/install/debian/conffiles
diff --git a/install/debian/control.template b/src/install/debian/control.template
similarity index 100%
rename from install/debian/control.template
rename to src/install/debian/control.template
diff --git a/install/debian/postinst b/src/install/debian/postinst
similarity index 100%
rename from install/debian/postinst
rename to src/install/debian/postinst
diff --git a/install/debian/postrm b/src/install/debian/postrm
similarity index 100%
rename from install/debian/postrm
rename to src/install/debian/postrm
diff --git a/install/debian/prerm b/src/install/debian/prerm
similarity index 100%
rename from install/debian/prerm
rename to src/install/debian/prerm
diff --git a/install/mod_pagespeed_example/add_instrumentation.html b/src/install/mod_pagespeed_example/add_instrumentation.html
similarity index 100%
rename from install/mod_pagespeed_example/add_instrumentation.html
rename to src/install/mod_pagespeed_example/add_instrumentation.html
diff --git a/install/mod_pagespeed_example/collapse_whitespace.html b/src/install/mod_pagespeed_example/collapse_whitespace.html
similarity index 100%
rename from install/mod_pagespeed_example/collapse_whitespace.html
rename to src/install/mod_pagespeed_example/collapse_whitespace.html
diff --git a/install/mod_pagespeed_example/combine_css.html b/src/install/mod_pagespeed_example/combine_css.html
similarity index 100%
rename from install/mod_pagespeed_example/combine_css.html
rename to src/install/mod_pagespeed_example/combine_css.html
diff --git a/install/mod_pagespeed_example/combine_heads.html b/src/install/mod_pagespeed_example/combine_heads.html
similarity index 100%
rename from install/mod_pagespeed_example/combine_heads.html
rename to src/install/mod_pagespeed_example/combine_heads.html
diff --git a/install/mod_pagespeed_example/elide_attributes.html b/src/install/mod_pagespeed_example/elide_attributes.html
similarity index 100%
rename from install/mod_pagespeed_example/elide_attributes.html
rename to src/install/mod_pagespeed_example/elide_attributes.html
diff --git a/install/mod_pagespeed_example/extend_cache.html b/src/install/mod_pagespeed_example/extend_cache.html
similarity index 100%
rename from install/mod_pagespeed_example/extend_cache.html
rename to src/install/mod_pagespeed_example/extend_cache.html
diff --git a/install/mod_pagespeed_example/images/BikeCrashIcn.png b/src/install/mod_pagespeed_example/images/BikeCrashIcn.png
similarity index 100%
rename from install/mod_pagespeed_example/images/BikeCrashIcn.png
rename to src/install/mod_pagespeed_example/images/BikeCrashIcn.png
Binary files differ
diff --git a/install/mod_pagespeed_example/images/Cuppa.png b/src/install/mod_pagespeed_example/images/Cuppa.png
similarity index 100%
rename from install/mod_pagespeed_example/images/Cuppa.png
rename to src/install/mod_pagespeed_example/images/Cuppa.png
Binary files differ
diff --git a/install/mod_pagespeed_example/images/Puzzle.jpg b/src/install/mod_pagespeed_example/images/Puzzle.jpg
similarity index 100%
rename from install/mod_pagespeed_example/images/Puzzle.jpg
rename to src/install/mod_pagespeed_example/images/Puzzle.jpg
Binary files differ
diff --git a/install/mod_pagespeed_example/index.html b/src/install/mod_pagespeed_example/index.html
similarity index 100%
rename from install/mod_pagespeed_example/index.html
rename to src/install/mod_pagespeed_example/index.html
diff --git a/install/mod_pagespeed_example/inline_css.html b/src/install/mod_pagespeed_example/inline_css.html
similarity index 100%
rename from install/mod_pagespeed_example/inline_css.html
rename to src/install/mod_pagespeed_example/inline_css.html
diff --git a/install/mod_pagespeed_example/inline_javascript.html b/src/install/mod_pagespeed_example/inline_javascript.html
similarity index 100%
rename from install/mod_pagespeed_example/inline_javascript.html
rename to src/install/mod_pagespeed_example/inline_javascript.html
diff --git a/install/mod_pagespeed_example/inline_javascript.js b/src/install/mod_pagespeed_example/inline_javascript.js
similarity index 100%
rename from install/mod_pagespeed_example/inline_javascript.js
rename to src/install/mod_pagespeed_example/inline_javascript.js
diff --git a/install/mod_pagespeed_example/move_css_to_head.html b/src/install/mod_pagespeed_example/move_css_to_head.html
similarity index 100%
rename from install/mod_pagespeed_example/move_css_to_head.html
rename to src/install/mod_pagespeed_example/move_css_to_head.html
diff --git a/install/mod_pagespeed_example/outline_css.html b/src/install/mod_pagespeed_example/outline_css.html
similarity index 100%
rename from install/mod_pagespeed_example/outline_css.html
rename to src/install/mod_pagespeed_example/outline_css.html
diff --git a/install/mod_pagespeed_example/outline_javascript.html b/src/install/mod_pagespeed_example/outline_javascript.html
similarity index 100%
rename from install/mod_pagespeed_example/outline_javascript.html
rename to src/install/mod_pagespeed_example/outline_javascript.html
diff --git a/install/mod_pagespeed_example/remove_comments.html b/src/install/mod_pagespeed_example/remove_comments.html
similarity index 100%
rename from install/mod_pagespeed_example/remove_comments.html
rename to src/install/mod_pagespeed_example/remove_comments.html
diff --git a/install/mod_pagespeed_example/remove_quotes.html b/src/install/mod_pagespeed_example/remove_quotes.html
similarity index 100%
rename from install/mod_pagespeed_example/remove_quotes.html
rename to src/install/mod_pagespeed_example/remove_quotes.html
diff --git a/install/mod_pagespeed_example/rewrite_css.html b/src/install/mod_pagespeed_example/rewrite_css.html
similarity index 100%
rename from install/mod_pagespeed_example/rewrite_css.html
rename to src/install/mod_pagespeed_example/rewrite_css.html
diff --git a/install/mod_pagespeed_example/rewrite_images.html b/src/install/mod_pagespeed_example/rewrite_images.html
similarity index 100%
rename from install/mod_pagespeed_example/rewrite_images.html
rename to src/install/mod_pagespeed_example/rewrite_images.html
diff --git a/install/mod_pagespeed_example/rewrite_javascript.html b/src/install/mod_pagespeed_example/rewrite_javascript.html
similarity index 100%
rename from install/mod_pagespeed_example/rewrite_javascript.html
rename to src/install/mod_pagespeed_example/rewrite_javascript.html
diff --git a/install/mod_pagespeed_example/rewrite_javascript.js b/src/install/mod_pagespeed_example/rewrite_javascript.js
similarity index 100%
rename from install/mod_pagespeed_example/rewrite_javascript.js
rename to src/install/mod_pagespeed_example/rewrite_javascript.js
diff --git a/install/mod_pagespeed_example/styles/all_styles.css b/src/install/mod_pagespeed_example/styles/all_styles.css
similarity index 100%
rename from install/mod_pagespeed_example/styles/all_styles.css
rename to src/install/mod_pagespeed_example/styles/all_styles.css
diff --git a/install/mod_pagespeed_example/styles/big.css b/src/install/mod_pagespeed_example/styles/big.css
similarity index 100%
rename from install/mod_pagespeed_example/styles/big.css
rename to src/install/mod_pagespeed_example/styles/big.css
diff --git a/install/mod_pagespeed_example/styles/blue.css b/src/install/mod_pagespeed_example/styles/blue.css
similarity index 100%
rename from install/mod_pagespeed_example/styles/blue.css
rename to src/install/mod_pagespeed_example/styles/blue.css
diff --git a/install/mod_pagespeed_example/styles/bold.css b/src/install/mod_pagespeed_example/styles/bold.css
similarity index 100%
rename from install/mod_pagespeed_example/styles/bold.css
rename to src/install/mod_pagespeed_example/styles/bold.css
diff --git a/install/mod_pagespeed_example/styles/yellow.css b/src/install/mod_pagespeed_example/styles/yellow.css
similarity index 100%
rename from install/mod_pagespeed_example/styles/yellow.css
rename to src/install/mod_pagespeed_example/styles/yellow.css
diff --git a/install/pagespeed.conf.template b/src/install/pagespeed.conf.template
similarity index 100%
rename from install/pagespeed.conf.template
rename to src/install/pagespeed.conf.template
diff --git a/install/proxy.conf.template b/src/install/proxy.conf.template
similarity index 100%
rename from install/proxy.conf.template
rename to src/install/proxy.conf.template
diff --git a/install/rpm/build.sh b/src/install/rpm/build.sh
similarity index 100%
rename from install/rpm/build.sh
rename to src/install/rpm/build.sh
diff --git a/install/rpm/mod-pagespeed.spec.template b/src/install/rpm/mod-pagespeed.spec.template
similarity index 100%
rename from install/rpm/mod-pagespeed.spec.template
rename to src/install/rpm/mod-pagespeed.spec.template
diff --git a/install/system_test.sh b/src/install/system_test.sh
similarity index 100%
rename from install/system_test.sh
rename to src/install/system_test.sh
diff --git a/install/ubuntu.sh b/src/install/ubuntu.sh
similarity index 100%
rename from install/ubuntu.sh
rename to src/install/ubuntu.sh
diff --git a/net/instaweb/apache/apache_message_handler.cc b/src/net/instaweb/apache/apache_message_handler.cc
similarity index 100%
rename from net/instaweb/apache/apache_message_handler.cc
rename to src/net/instaweb/apache/apache_message_handler.cc
diff --git a/net/instaweb/apache/apache_message_handler.h b/src/net/instaweb/apache/apache_message_handler.h
similarity index 100%
rename from net/instaweb/apache/apache_message_handler.h
rename to src/net/instaweb/apache/apache_message_handler.h
diff --git a/net/instaweb/apache/apache_rewrite_driver_factory.cc b/src/net/instaweb/apache/apache_rewrite_driver_factory.cc
similarity index 100%
rename from net/instaweb/apache/apache_rewrite_driver_factory.cc
rename to src/net/instaweb/apache/apache_rewrite_driver_factory.cc
diff --git a/net/instaweb/apache/apache_rewrite_driver_factory.h b/src/net/instaweb/apache/apache_rewrite_driver_factory.h
similarity index 100%
rename from net/instaweb/apache/apache_rewrite_driver_factory.h
rename to src/net/instaweb/apache/apache_rewrite_driver_factory.h
diff --git a/net/instaweb/apache/apache_slurp.cc b/src/net/instaweb/apache/apache_slurp.cc
similarity index 100%
rename from net/instaweb/apache/apache_slurp.cc
rename to src/net/instaweb/apache/apache_slurp.cc
diff --git a/net/instaweb/apache/apache_slurp.h b/src/net/instaweb/apache/apache_slurp.h
similarity index 100%
rename from net/instaweb/apache/apache_slurp.h
rename to src/net/instaweb/apache/apache_slurp.h
diff --git a/net/instaweb/apache/apr_file_system.cc b/src/net/instaweb/apache/apr_file_system.cc
similarity index 100%
rename from net/instaweb/apache/apr_file_system.cc
rename to src/net/instaweb/apache/apr_file_system.cc
diff --git a/net/instaweb/apache/apr_file_system.h b/src/net/instaweb/apache/apr_file_system.h
similarity index 100%
rename from net/instaweb/apache/apr_file_system.h
rename to src/net/instaweb/apache/apr_file_system.h
diff --git a/net/instaweb/apache/apr_file_system_test.cc b/src/net/instaweb/apache/apr_file_system_test.cc
similarity index 100%
rename from net/instaweb/apache/apr_file_system_test.cc
rename to src/net/instaweb/apache/apr_file_system_test.cc
diff --git a/net/instaweb/apache/apr_mutex.cc b/src/net/instaweb/apache/apr_mutex.cc
similarity index 100%
rename from net/instaweb/apache/apr_mutex.cc
rename to src/net/instaweb/apache/apr_mutex.cc
diff --git a/net/instaweb/apache/apr_mutex.h b/src/net/instaweb/apache/apr_mutex.h
similarity index 100%
rename from net/instaweb/apache/apr_mutex.h
rename to src/net/instaweb/apache/apr_mutex.h
diff --git a/net/instaweb/apache/apr_statistics.cc b/src/net/instaweb/apache/apr_statistics.cc
similarity index 100%
rename from net/instaweb/apache/apr_statistics.cc
rename to src/net/instaweb/apache/apr_statistics.cc
diff --git a/net/instaweb/apache/apr_statistics.h b/src/net/instaweb/apache/apr_statistics.h
similarity index 100%
rename from net/instaweb/apache/apr_statistics.h
rename to src/net/instaweb/apache/apr_statistics.h
diff --git a/net/instaweb/apache/apr_timer.cc b/src/net/instaweb/apache/apr_timer.cc
similarity index 100%
rename from net/instaweb/apache/apr_timer.cc
rename to src/net/instaweb/apache/apr_timer.cc
diff --git a/net/instaweb/apache/apr_timer.h b/src/net/instaweb/apache/apr_timer.h
similarity index 100%
rename from net/instaweb/apache/apr_timer.h
rename to src/net/instaweb/apache/apr_timer.h
diff --git a/net/instaweb/apache/header_util.cc b/src/net/instaweb/apache/header_util.cc
similarity index 100%
rename from net/instaweb/apache/header_util.cc
rename to src/net/instaweb/apache/header_util.cc
diff --git a/net/instaweb/apache/header_util.h b/src/net/instaweb/apache/header_util.h
similarity index 100%
rename from net/instaweb/apache/header_util.h
rename to src/net/instaweb/apache/header_util.h
diff --git a/net/instaweb/apache/instaweb_context.cc b/src/net/instaweb/apache/instaweb_context.cc
similarity index 100%
rename from net/instaweb/apache/instaweb_context.cc
rename to src/net/instaweb/apache/instaweb_context.cc
diff --git a/net/instaweb/apache/instaweb_context.h b/src/net/instaweb/apache/instaweb_context.h
similarity index 100%
rename from net/instaweb/apache/instaweb_context.h
rename to src/net/instaweb/apache/instaweb_context.h
diff --git a/net/instaweb/apache/instaweb_handler.cc b/src/net/instaweb/apache/instaweb_handler.cc
similarity index 100%
rename from net/instaweb/apache/instaweb_handler.cc
rename to src/net/instaweb/apache/instaweb_handler.cc
diff --git a/net/instaweb/apache/instaweb_handler.h b/src/net/instaweb/apache/instaweb_handler.h
similarity index 100%
rename from net/instaweb/apache/instaweb_handler.h
rename to src/net/instaweb/apache/instaweb_handler.h
diff --git a/net/instaweb/apache/log_message_handler.cc b/src/net/instaweb/apache/log_message_handler.cc
similarity index 100%
rename from net/instaweb/apache/log_message_handler.cc
rename to src/net/instaweb/apache/log_message_handler.cc
diff --git a/net/instaweb/apache/log_message_handler.h b/src/net/instaweb/apache/log_message_handler.h
similarity index 100%
rename from net/instaweb/apache/log_message_handler.h
rename to src/net/instaweb/apache/log_message_handler.h
diff --git a/net/instaweb/apache/mod_instaweb.cc b/src/net/instaweb/apache/mod_instaweb.cc
similarity index 100%
rename from net/instaweb/apache/mod_instaweb.cc
rename to src/net/instaweb/apache/mod_instaweb.cc
diff --git a/net/instaweb/apache/mod_instaweb.h b/src/net/instaweb/apache/mod_instaweb.h
similarity index 100%
rename from net/instaweb/apache/mod_instaweb.h
rename to src/net/instaweb/apache/mod_instaweb.h
diff --git a/net/instaweb/apache/serf_url_async_fetcher.cc b/src/net/instaweb/apache/serf_url_async_fetcher.cc
similarity index 100%
rename from net/instaweb/apache/serf_url_async_fetcher.cc
rename to src/net/instaweb/apache/serf_url_async_fetcher.cc
diff --git a/net/instaweb/apache/serf_url_async_fetcher.h b/src/net/instaweb/apache/serf_url_async_fetcher.h
similarity index 100%
rename from net/instaweb/apache/serf_url_async_fetcher.h
rename to src/net/instaweb/apache/serf_url_async_fetcher.h
diff --git a/net/instaweb/apache/serf_url_async_fetcher_test.cc b/src/net/instaweb/apache/serf_url_async_fetcher_test.cc
similarity index 100%
rename from net/instaweb/apache/serf_url_async_fetcher_test.cc
rename to src/net/instaweb/apache/serf_url_async_fetcher_test.cc
diff --git a/net/instaweb/apache/serf_url_fetcher.cc b/src/net/instaweb/apache/serf_url_fetcher.cc
similarity index 100%
rename from net/instaweb/apache/serf_url_fetcher.cc
rename to src/net/instaweb/apache/serf_url_fetcher.cc
diff --git a/net/instaweb/apache/serf_url_fetcher.h b/src/net/instaweb/apache/serf_url_fetcher.h
similarity index 100%
rename from net/instaweb/apache/serf_url_fetcher.h
rename to src/net/instaweb/apache/serf_url_fetcher.h
diff --git a/net/instaweb/htmlparse/empty_html_filter.cc b/src/net/instaweb/htmlparse/empty_html_filter.cc
similarity index 100%
rename from net/instaweb/htmlparse/empty_html_filter.cc
rename to src/net/instaweb/htmlparse/empty_html_filter.cc
diff --git a/net/instaweb/htmlparse/file_driver.cc b/src/net/instaweb/htmlparse/file_driver.cc
similarity index 100%
rename from net/instaweb/htmlparse/file_driver.cc
rename to src/net/instaweb/htmlparse/file_driver.cc
diff --git a/net/instaweb/htmlparse/file_statistics_log.cc b/src/net/instaweb/htmlparse/file_statistics_log.cc
similarity index 100%
rename from net/instaweb/htmlparse/file_statistics_log.cc
rename to src/net/instaweb/htmlparse/file_statistics_log.cc
diff --git a/net/instaweb/htmlparse/html_element.cc b/src/net/instaweb/htmlparse/html_element.cc
similarity index 100%
rename from net/instaweb/htmlparse/html_element.cc
rename to src/net/instaweb/htmlparse/html_element.cc
diff --git a/net/instaweb/htmlparse/html_escape.cc b/src/net/instaweb/htmlparse/html_escape.cc
similarity index 100%
rename from net/instaweb/htmlparse/html_escape.cc
rename to src/net/instaweb/htmlparse/html_escape.cc
diff --git a/net/instaweb/htmlparse/html_event.cc b/src/net/instaweb/htmlparse/html_event.cc
similarity index 100%
rename from net/instaweb/htmlparse/html_event.cc
rename to src/net/instaweb/htmlparse/html_event.cc
diff --git a/net/instaweb/htmlparse/html_event.h b/src/net/instaweb/htmlparse/html_event.h
similarity index 100%
rename from net/instaweb/htmlparse/html_event.h
rename to src/net/instaweb/htmlparse/html_event.h
diff --git a/net/instaweb/htmlparse/html_filter.cc b/src/net/instaweb/htmlparse/html_filter.cc
similarity index 100%
rename from net/instaweb/htmlparse/html_filter.cc
rename to src/net/instaweb/htmlparse/html_filter.cc
diff --git a/net/instaweb/htmlparse/html_lexer.cc b/src/net/instaweb/htmlparse/html_lexer.cc
similarity index 100%
rename from net/instaweb/htmlparse/html_lexer.cc
rename to src/net/instaweb/htmlparse/html_lexer.cc
diff --git a/net/instaweb/htmlparse/html_lexer.h b/src/net/instaweb/htmlparse/html_lexer.h
similarity index 100%
rename from net/instaweb/htmlparse/html_lexer.h
rename to src/net/instaweb/htmlparse/html_lexer.h
diff --git a/net/instaweb/htmlparse/html_node.cc b/src/net/instaweb/htmlparse/html_node.cc
similarity index 100%
rename from net/instaweb/htmlparse/html_node.cc
rename to src/net/instaweb/htmlparse/html_node.cc
diff --git a/net/instaweb/htmlparse/html_parse.cc b/src/net/instaweb/htmlparse/html_parse.cc
similarity index 100%
rename from net/instaweb/htmlparse/html_parse.cc
rename to src/net/instaweb/htmlparse/html_parse.cc
diff --git a/net/instaweb/htmlparse/html_parse_test.cc b/src/net/instaweb/htmlparse/html_parse_test.cc
similarity index 100%
rename from net/instaweb/htmlparse/html_parse_test.cc
rename to src/net/instaweb/htmlparse/html_parse_test.cc
diff --git a/net/instaweb/htmlparse/html_testing_peer.h b/src/net/instaweb/htmlparse/html_testing_peer.h
similarity index 100%
rename from net/instaweb/htmlparse/html_testing_peer.h
rename to src/net/instaweb/htmlparse/html_testing_peer.h
diff --git a/net/instaweb/htmlparse/html_writer_filter.cc b/src/net/instaweb/htmlparse/html_writer_filter.cc
similarity index 100%
rename from net/instaweb/htmlparse/html_writer_filter.cc
rename to src/net/instaweb/htmlparse/html_writer_filter.cc
diff --git a/net/instaweb/htmlparse/logging_html_filter.cc b/src/net/instaweb/htmlparse/logging_html_filter.cc
similarity index 100%
rename from net/instaweb/htmlparse/logging_html_filter.cc
rename to src/net/instaweb/htmlparse/logging_html_filter.cc
diff --git a/net/instaweb/htmlparse/null_filter.cc b/src/net/instaweb/htmlparse/null_filter.cc
similarity index 100%
rename from net/instaweb/htmlparse/null_filter.cc
rename to src/net/instaweb/htmlparse/null_filter.cc
diff --git a/net/instaweb/htmlparse/null_filter.h b/src/net/instaweb/htmlparse/null_filter.h
similarity index 100%
rename from net/instaweb/htmlparse/null_filter.h
rename to src/net/instaweb/htmlparse/null_filter.h
diff --git a/net/instaweb/htmlparse/public/empty_html_filter.h b/src/net/instaweb/htmlparse/public/empty_html_filter.h
similarity index 100%
rename from net/instaweb/htmlparse/public/empty_html_filter.h
rename to src/net/instaweb/htmlparse/public/empty_html_filter.h
diff --git a/net/instaweb/htmlparse/public/file_driver.h b/src/net/instaweb/htmlparse/public/file_driver.h
similarity index 100%
rename from net/instaweb/htmlparse/public/file_driver.h
rename to src/net/instaweb/htmlparse/public/file_driver.h
diff --git a/net/instaweb/htmlparse/public/file_statistics_log.h b/src/net/instaweb/htmlparse/public/file_statistics_log.h
similarity index 100%
rename from net/instaweb/htmlparse/public/file_statistics_log.h
rename to src/net/instaweb/htmlparse/public/file_statistics_log.h
diff --git a/net/instaweb/htmlparse/public/html_element.h b/src/net/instaweb/htmlparse/public/html_element.h
similarity index 100%
rename from net/instaweb/htmlparse/public/html_element.h
rename to src/net/instaweb/htmlparse/public/html_element.h
diff --git a/net/instaweb/htmlparse/public/html_escape.h b/src/net/instaweb/htmlparse/public/html_escape.h
similarity index 100%
rename from net/instaweb/htmlparse/public/html_escape.h
rename to src/net/instaweb/htmlparse/public/html_escape.h
diff --git a/net/instaweb/htmlparse/public/html_filter.h b/src/net/instaweb/htmlparse/public/html_filter.h
similarity index 100%
rename from net/instaweb/htmlparse/public/html_filter.h
rename to src/net/instaweb/htmlparse/public/html_filter.h
diff --git a/net/instaweb/htmlparse/public/html_node.h b/src/net/instaweb/htmlparse/public/html_node.h
similarity index 100%
rename from net/instaweb/htmlparse/public/html_node.h
rename to src/net/instaweb/htmlparse/public/html_node.h
diff --git a/net/instaweb/htmlparse/public/html_parse.h b/src/net/instaweb/htmlparse/public/html_parse.h
similarity index 100%
rename from net/instaweb/htmlparse/public/html_parse.h
rename to src/net/instaweb/htmlparse/public/html_parse.h
diff --git a/net/instaweb/htmlparse/public/html_parse_test_base.h b/src/net/instaweb/htmlparse/public/html_parse_test_base.h
similarity index 100%
rename from net/instaweb/htmlparse/public/html_parse_test_base.h
rename to src/net/instaweb/htmlparse/public/html_parse_test_base.h
diff --git a/net/instaweb/htmlparse/public/html_parser_types.h b/src/net/instaweb/htmlparse/public/html_parser_types.h
similarity index 100%
rename from net/instaweb/htmlparse/public/html_parser_types.h
rename to src/net/instaweb/htmlparse/public/html_parser_types.h
diff --git a/net/instaweb/htmlparse/public/html_writer_filter.h b/src/net/instaweb/htmlparse/public/html_writer_filter.h
similarity index 100%
rename from net/instaweb/htmlparse/public/html_writer_filter.h
rename to src/net/instaweb/htmlparse/public/html_writer_filter.h
diff --git a/net/instaweb/htmlparse/public/logging_html_filter.h b/src/net/instaweb/htmlparse/public/logging_html_filter.h
similarity index 100%
rename from net/instaweb/htmlparse/public/logging_html_filter.h
rename to src/net/instaweb/htmlparse/public/logging_html_filter.h
diff --git a/net/instaweb/htmlparse/public/statistics_log.h b/src/net/instaweb/htmlparse/public/statistics_log.h
similarity index 100%
rename from net/instaweb/htmlparse/public/statistics_log.h
rename to src/net/instaweb/htmlparse/public/statistics_log.h
diff --git a/net/instaweb/htmlparse/statistics_log.cc b/src/net/instaweb/htmlparse/statistics_log.cc
similarity index 100%
rename from net/instaweb/htmlparse/statistics_log.cc
rename to src/net/instaweb/htmlparse/statistics_log.cc
diff --git a/net/instaweb/instaweb.gyp b/src/net/instaweb/instaweb.gyp
similarity index 100%
rename from net/instaweb/instaweb.gyp
rename to src/net/instaweb/instaweb.gyp
diff --git a/net/instaweb/instaweb_core.gyp b/src/net/instaweb/instaweb_core.gyp
similarity index 100%
rename from net/instaweb/instaweb_core.gyp
rename to src/net/instaweb/instaweb_core.gyp
diff --git a/net/instaweb/instaweb_html_rewriter.gyp b/src/net/instaweb/instaweb_html_rewriter.gyp
similarity index 100%
rename from net/instaweb/instaweb_html_rewriter.gyp
rename to src/net/instaweb/instaweb_html_rewriter.gyp
diff --git a/net/instaweb/instaweb_mod_instaweb.gyp b/src/net/instaweb/instaweb_mod_instaweb.gyp
similarity index 100%
rename from net/instaweb/instaweb_mod_instaweb.gyp
rename to src/net/instaweb/instaweb_mod_instaweb.gyp
diff --git a/net/instaweb/instaweb_mod_slurp.gyp b/src/net/instaweb/instaweb_mod_slurp.gyp
similarity index 100%
rename from net/instaweb/instaweb_mod_slurp.gyp
rename to src/net/instaweb/instaweb_mod_slurp.gyp
diff --git a/net/instaweb/instaweb_protobuf_gzip.gyp b/src/net/instaweb/instaweb_protobuf_gzip.gyp
similarity index 100%
rename from net/instaweb/instaweb_protobuf_gzip.gyp
rename to src/net/instaweb/instaweb_protobuf_gzip.gyp
diff --git a/net/instaweb/mod_pagespeed.gyp b/src/net/instaweb/mod_pagespeed.gyp
similarity index 100%
rename from net/instaweb/mod_pagespeed.gyp
rename to src/net/instaweb/mod_pagespeed.gyp
diff --git a/net/instaweb/public/VERSION b/src/net/instaweb/public/VERSION
similarity index 100%
rename from net/instaweb/public/VERSION
rename to src/net/instaweb/public/VERSION
diff --git a/net/instaweb/public/version.h.in b/src/net/instaweb/public/version.h.in
similarity index 100%
rename from net/instaweb/public/version.h.in
rename to src/net/instaweb/public/version.h.in
diff --git a/net/instaweb/rewriter/add_head_filter.cc b/src/net/instaweb/rewriter/add_head_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/add_head_filter.cc
rename to src/net/instaweb/rewriter/add_head_filter.cc
diff --git a/net/instaweb/rewriter/add_instrumentation_filter.cc b/src/net/instaweb/rewriter/add_instrumentation_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/add_instrumentation_filter.cc
rename to src/net/instaweb/rewriter/add_instrumentation_filter.cc
diff --git a/net/instaweb/rewriter/base_tag_filter.cc b/src/net/instaweb/rewriter/base_tag_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/base_tag_filter.cc
rename to src/net/instaweb/rewriter/base_tag_filter.cc
diff --git a/net/instaweb/rewriter/cache_extender.cc b/src/net/instaweb/rewriter/cache_extender.cc
similarity index 100%
rename from net/instaweb/rewriter/cache_extender.cc
rename to src/net/instaweb/rewriter/cache_extender.cc
diff --git a/net/instaweb/rewriter/cache_extender_test.cc b/src/net/instaweb/rewriter/cache_extender_test.cc
similarity index 100%
rename from net/instaweb/rewriter/cache_extender_test.cc
rename to src/net/instaweb/rewriter/cache_extender_test.cc
diff --git a/net/instaweb/rewriter/collapse_whitespace_filter.cc b/src/net/instaweb/rewriter/collapse_whitespace_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/collapse_whitespace_filter.cc
rename to src/net/instaweb/rewriter/collapse_whitespace_filter.cc
diff --git a/net/instaweb/rewriter/collapse_whitespace_filter_test.cc b/src/net/instaweb/rewriter/collapse_whitespace_filter_test.cc
similarity index 100%
rename from net/instaweb/rewriter/collapse_whitespace_filter_test.cc
rename to src/net/instaweb/rewriter/collapse_whitespace_filter_test.cc
diff --git a/net/instaweb/rewriter/common_filter.cc b/src/net/instaweb/rewriter/common_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/common_filter.cc
rename to src/net/instaweb/rewriter/common_filter.cc
diff --git a/net/instaweb/rewriter/common_filter_test.cc b/src/net/instaweb/rewriter/common_filter_test.cc
similarity index 100%
rename from net/instaweb/rewriter/common_filter_test.cc
rename to src/net/instaweb/rewriter/common_filter_test.cc
diff --git a/net/instaweb/rewriter/css_combine_filter.cc b/src/net/instaweb/rewriter/css_combine_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/css_combine_filter.cc
rename to src/net/instaweb/rewriter/css_combine_filter.cc
diff --git a/net/instaweb/rewriter/css_filter.cc b/src/net/instaweb/rewriter/css_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/css_filter.cc
rename to src/net/instaweb/rewriter/css_filter.cc
diff --git a/net/instaweb/rewriter/css_filter_test.cc b/src/net/instaweb/rewriter/css_filter_test.cc
similarity index 100%
rename from net/instaweb/rewriter/css_filter_test.cc
rename to src/net/instaweb/rewriter/css_filter_test.cc
diff --git a/net/instaweb/rewriter/css_inline_filter.cc b/src/net/instaweb/rewriter/css_inline_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/css_inline_filter.cc
rename to src/net/instaweb/rewriter/css_inline_filter.cc
diff --git a/net/instaweb/rewriter/css_minify.cc b/src/net/instaweb/rewriter/css_minify.cc
similarity index 100%
rename from net/instaweb/rewriter/css_minify.cc
rename to src/net/instaweb/rewriter/css_minify.cc
diff --git a/net/instaweb/rewriter/css_move_to_head_filter.cc b/src/net/instaweb/rewriter/css_move_to_head_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/css_move_to_head_filter.cc
rename to src/net/instaweb/rewriter/css_move_to_head_filter.cc
diff --git a/net/instaweb/rewriter/css_move_to_head_filter_test.cc b/src/net/instaweb/rewriter/css_move_to_head_filter_test.cc
similarity index 100%
rename from net/instaweb/rewriter/css_move_to_head_filter_test.cc
rename to src/net/instaweb/rewriter/css_move_to_head_filter_test.cc
diff --git a/net/instaweb/rewriter/css_outline_filter.cc b/src/net/instaweb/rewriter/css_outline_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/css_outline_filter.cc
rename to src/net/instaweb/rewriter/css_outline_filter.cc
diff --git a/net/instaweb/rewriter/css_tag_scanner.cc b/src/net/instaweb/rewriter/css_tag_scanner.cc
similarity index 100%
rename from net/instaweb/rewriter/css_tag_scanner.cc
rename to src/net/instaweb/rewriter/css_tag_scanner.cc
diff --git a/net/instaweb/rewriter/css_tag_scanner_test.cc b/src/net/instaweb/rewriter/css_tag_scanner_test.cc
similarity index 100%
rename from net/instaweb/rewriter/css_tag_scanner_test.cc
rename to src/net/instaweb/rewriter/css_tag_scanner_test.cc
diff --git a/net/instaweb/rewriter/data_url_input_resource.cc b/src/net/instaweb/rewriter/data_url_input_resource.cc
similarity index 100%
rename from net/instaweb/rewriter/data_url_input_resource.cc
rename to src/net/instaweb/rewriter/data_url_input_resource.cc
diff --git a/net/instaweb/rewriter/domain_lawyer.cc b/src/net/instaweb/rewriter/domain_lawyer.cc
similarity index 100%
rename from net/instaweb/rewriter/domain_lawyer.cc
rename to src/net/instaweb/rewriter/domain_lawyer.cc
diff --git a/net/instaweb/rewriter/domain_lawyer_test.cc b/src/net/instaweb/rewriter/domain_lawyer_test.cc
similarity index 100%
rename from net/instaweb/rewriter/domain_lawyer_test.cc
rename to src/net/instaweb/rewriter/domain_lawyer_test.cc
diff --git a/net/instaweb/rewriter/elide_attributes_filter.cc b/src/net/instaweb/rewriter/elide_attributes_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/elide_attributes_filter.cc
rename to src/net/instaweb/rewriter/elide_attributes_filter.cc
diff --git a/net/instaweb/rewriter/elide_attributes_filter_test.cc b/src/net/instaweb/rewriter/elide_attributes_filter_test.cc
similarity index 100%
rename from net/instaweb/rewriter/elide_attributes_filter_test.cc
rename to src/net/instaweb/rewriter/elide_attributes_filter_test.cc
diff --git a/net/instaweb/rewriter/file_input_resource.cc b/src/net/instaweb/rewriter/file_input_resource.cc
similarity index 100%
rename from net/instaweb/rewriter/file_input_resource.cc
rename to src/net/instaweb/rewriter/file_input_resource.cc
diff --git a/net/instaweb/rewriter/html_attribute_quote_removal.cc b/src/net/instaweb/rewriter/html_attribute_quote_removal.cc
similarity index 100%
rename from net/instaweb/rewriter/html_attribute_quote_removal.cc
rename to src/net/instaweb/rewriter/html_attribute_quote_removal.cc
diff --git a/net/instaweb/rewriter/html_attribute_quote_removal_test.cc b/src/net/instaweb/rewriter/html_attribute_quote_removal_test.cc
similarity index 100%
rename from net/instaweb/rewriter/html_attribute_quote_removal_test.cc
rename to src/net/instaweb/rewriter/html_attribute_quote_removal_test.cc
diff --git a/net/instaweb/rewriter/image.cc b/src/net/instaweb/rewriter/image.cc
similarity index 100%
rename from net/instaweb/rewriter/image.cc
rename to src/net/instaweb/rewriter/image.cc
diff --git a/net/instaweb/rewriter/image_dim.cc b/src/net/instaweb/rewriter/image_dim.cc
similarity index 100%
rename from net/instaweb/rewriter/image_dim.cc
rename to src/net/instaweb/rewriter/image_dim.cc
diff --git a/net/instaweb/rewriter/image_endian_test.cc b/src/net/instaweb/rewriter/image_endian_test.cc
similarity index 100%
rename from net/instaweb/rewriter/image_endian_test.cc
rename to src/net/instaweb/rewriter/image_endian_test.cc
diff --git a/net/instaweb/rewriter/img_rewrite_filter.cc b/src/net/instaweb/rewriter/img_rewrite_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/img_rewrite_filter.cc
rename to src/net/instaweb/rewriter/img_rewrite_filter.cc
diff --git a/net/instaweb/rewriter/img_tag_scanner.cc b/src/net/instaweb/rewriter/img_tag_scanner.cc
similarity index 100%
rename from net/instaweb/rewriter/img_tag_scanner.cc
rename to src/net/instaweb/rewriter/img_tag_scanner.cc
diff --git a/net/instaweb/rewriter/javascript_code_block.cc b/src/net/instaweb/rewriter/javascript_code_block.cc
similarity index 100%
rename from net/instaweb/rewriter/javascript_code_block.cc
rename to src/net/instaweb/rewriter/javascript_code_block.cc
diff --git a/net/instaweb/rewriter/javascript_code_block_test.cc b/src/net/instaweb/rewriter/javascript_code_block_test.cc
similarity index 100%
rename from net/instaweb/rewriter/javascript_code_block_test.cc
rename to src/net/instaweb/rewriter/javascript_code_block_test.cc
diff --git a/net/instaweb/rewriter/javascript_filter.cc b/src/net/instaweb/rewriter/javascript_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/javascript_filter.cc
rename to src/net/instaweb/rewriter/javascript_filter.cc
diff --git a/net/instaweb/rewriter/javascript_filter_test.cc b/src/net/instaweb/rewriter/javascript_filter_test.cc
similarity index 100%
rename from net/instaweb/rewriter/javascript_filter_test.cc
rename to src/net/instaweb/rewriter/javascript_filter_test.cc
diff --git a/net/instaweb/rewriter/javascript_library_identification.cc b/src/net/instaweb/rewriter/javascript_library_identification.cc
similarity index 100%
rename from net/instaweb/rewriter/javascript_library_identification.cc
rename to src/net/instaweb/rewriter/javascript_library_identification.cc
diff --git a/net/instaweb/rewriter/javascript_metadata.cc b/src/net/instaweb/rewriter/javascript_metadata.cc
similarity index 100%
rename from net/instaweb/rewriter/javascript_metadata.cc
rename to src/net/instaweb/rewriter/javascript_metadata.cc
diff --git a/net/instaweb/rewriter/js_inline_filter.cc b/src/net/instaweb/rewriter/js_inline_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/js_inline_filter.cc
rename to src/net/instaweb/rewriter/js_inline_filter.cc
diff --git a/net/instaweb/rewriter/js_outline_filter.cc b/src/net/instaweb/rewriter/js_outline_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/js_outline_filter.cc
rename to src/net/instaweb/rewriter/js_outline_filter.cc
diff --git a/net/instaweb/rewriter/output_resource.cc b/src/net/instaweb/rewriter/output_resource.cc
similarity index 100%
rename from net/instaweb/rewriter/output_resource.cc
rename to src/net/instaweb/rewriter/output_resource.cc
diff --git a/net/instaweb/rewriter/public/add_head_filter.h b/src/net/instaweb/rewriter/public/add_head_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/add_head_filter.h
rename to src/net/instaweb/rewriter/public/add_head_filter.h
diff --git a/net/instaweb/rewriter/public/add_instrumentation_filter.h b/src/net/instaweb/rewriter/public/add_instrumentation_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/add_instrumentation_filter.h
rename to src/net/instaweb/rewriter/public/add_instrumentation_filter.h
diff --git a/net/instaweb/rewriter/public/base_tag_filter.h b/src/net/instaweb/rewriter/public/base_tag_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/base_tag_filter.h
rename to src/net/instaweb/rewriter/public/base_tag_filter.h
diff --git a/net/instaweb/rewriter/public/cache_extender.h b/src/net/instaweb/rewriter/public/cache_extender.h
similarity index 100%
rename from net/instaweb/rewriter/public/cache_extender.h
rename to src/net/instaweb/rewriter/public/cache_extender.h
diff --git a/net/instaweb/rewriter/public/collapse_whitespace_filter.h b/src/net/instaweb/rewriter/public/collapse_whitespace_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/collapse_whitespace_filter.h
rename to src/net/instaweb/rewriter/public/collapse_whitespace_filter.h
diff --git a/net/instaweb/rewriter/public/common_filter.h b/src/net/instaweb/rewriter/public/common_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/common_filter.h
rename to src/net/instaweb/rewriter/public/common_filter.h
diff --git a/net/instaweb/rewriter/public/css_combine_filter.h b/src/net/instaweb/rewriter/public/css_combine_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/css_combine_filter.h
rename to src/net/instaweb/rewriter/public/css_combine_filter.h
diff --git a/net/instaweb/rewriter/public/css_filter.h b/src/net/instaweb/rewriter/public/css_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/css_filter.h
rename to src/net/instaweb/rewriter/public/css_filter.h
diff --git a/net/instaweb/rewriter/public/css_inline_filter.h b/src/net/instaweb/rewriter/public/css_inline_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/css_inline_filter.h
rename to src/net/instaweb/rewriter/public/css_inline_filter.h
diff --git a/net/instaweb/rewriter/public/css_minify.h b/src/net/instaweb/rewriter/public/css_minify.h
similarity index 100%
rename from net/instaweb/rewriter/public/css_minify.h
rename to src/net/instaweb/rewriter/public/css_minify.h
diff --git a/net/instaweb/rewriter/public/css_move_to_head_filter.h b/src/net/instaweb/rewriter/public/css_move_to_head_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/css_move_to_head_filter.h
rename to src/net/instaweb/rewriter/public/css_move_to_head_filter.h
diff --git a/net/instaweb/rewriter/public/css_outline_filter.h b/src/net/instaweb/rewriter/public/css_outline_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/css_outline_filter.h
rename to src/net/instaweb/rewriter/public/css_outline_filter.h
diff --git a/net/instaweb/rewriter/public/css_tag_scanner.h b/src/net/instaweb/rewriter/public/css_tag_scanner.h
similarity index 100%
rename from net/instaweb/rewriter/public/css_tag_scanner.h
rename to src/net/instaweb/rewriter/public/css_tag_scanner.h
diff --git a/net/instaweb/rewriter/public/data_url_input_resource.h b/src/net/instaweb/rewriter/public/data_url_input_resource.h
similarity index 100%
rename from net/instaweb/rewriter/public/data_url_input_resource.h
rename to src/net/instaweb/rewriter/public/data_url_input_resource.h
diff --git a/net/instaweb/rewriter/public/domain_lawyer.h b/src/net/instaweb/rewriter/public/domain_lawyer.h
similarity index 100%
rename from net/instaweb/rewriter/public/domain_lawyer.h
rename to src/net/instaweb/rewriter/public/domain_lawyer.h
diff --git a/net/instaweb/rewriter/public/elide_attributes_filter.h b/src/net/instaweb/rewriter/public/elide_attributes_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/elide_attributes_filter.h
rename to src/net/instaweb/rewriter/public/elide_attributes_filter.h
diff --git a/net/instaweb/rewriter/public/file_input_resource.h b/src/net/instaweb/rewriter/public/file_input_resource.h
similarity index 100%
rename from net/instaweb/rewriter/public/file_input_resource.h
rename to src/net/instaweb/rewriter/public/file_input_resource.h
diff --git a/net/instaweb/rewriter/public/html_attribute_quote_removal.h b/src/net/instaweb/rewriter/public/html_attribute_quote_removal.h
similarity index 100%
rename from net/instaweb/rewriter/public/html_attribute_quote_removal.h
rename to src/net/instaweb/rewriter/public/html_attribute_quote_removal.h
diff --git a/net/instaweb/rewriter/public/image.h b/src/net/instaweb/rewriter/public/image.h
similarity index 100%
rename from net/instaweb/rewriter/public/image.h
rename to src/net/instaweb/rewriter/public/image.h
diff --git a/net/instaweb/rewriter/public/image_dim.h b/src/net/instaweb/rewriter/public/image_dim.h
similarity index 100%
rename from net/instaweb/rewriter/public/image_dim.h
rename to src/net/instaweb/rewriter/public/image_dim.h
diff --git a/net/instaweb/rewriter/public/img_rewrite_filter.h b/src/net/instaweb/rewriter/public/img_rewrite_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/img_rewrite_filter.h
rename to src/net/instaweb/rewriter/public/img_rewrite_filter.h
diff --git a/net/instaweb/rewriter/public/img_tag_scanner.h b/src/net/instaweb/rewriter/public/img_tag_scanner.h
similarity index 100%
rename from net/instaweb/rewriter/public/img_tag_scanner.h
rename to src/net/instaweb/rewriter/public/img_tag_scanner.h
diff --git a/net/instaweb/rewriter/public/javascript_code_block.h b/src/net/instaweb/rewriter/public/javascript_code_block.h
similarity index 100%
rename from net/instaweb/rewriter/public/javascript_code_block.h
rename to src/net/instaweb/rewriter/public/javascript_code_block.h
diff --git a/net/instaweb/rewriter/public/javascript_filter.h b/src/net/instaweb/rewriter/public/javascript_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/javascript_filter.h
rename to src/net/instaweb/rewriter/public/javascript_filter.h
diff --git a/net/instaweb/rewriter/public/javascript_library_identification.h b/src/net/instaweb/rewriter/public/javascript_library_identification.h
similarity index 100%
rename from net/instaweb/rewriter/public/javascript_library_identification.h
rename to src/net/instaweb/rewriter/public/javascript_library_identification.h
diff --git a/net/instaweb/rewriter/public/js_inline_filter.h b/src/net/instaweb/rewriter/public/js_inline_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/js_inline_filter.h
rename to src/net/instaweb/rewriter/public/js_inline_filter.h
diff --git a/net/instaweb/rewriter/public/js_outline_filter.h b/src/net/instaweb/rewriter/public/js_outline_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/js_outline_filter.h
rename to src/net/instaweb/rewriter/public/js_outline_filter.h
diff --git a/net/instaweb/rewriter/public/output_resource.h b/src/net/instaweb/rewriter/public/output_resource.h
similarity index 100%
rename from net/instaweb/rewriter/public/output_resource.h
rename to src/net/instaweb/rewriter/public/output_resource.h
diff --git a/net/instaweb/rewriter/public/remove_comments_filter.h b/src/net/instaweb/rewriter/public/remove_comments_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/remove_comments_filter.h
rename to src/net/instaweb/rewriter/public/remove_comments_filter.h
diff --git a/net/instaweb/rewriter/public/resource.h b/src/net/instaweb/rewriter/public/resource.h
similarity index 100%
rename from net/instaweb/rewriter/public/resource.h
rename to src/net/instaweb/rewriter/public/resource.h
diff --git a/net/instaweb/rewriter/public/resource_manager.h b/src/net/instaweb/rewriter/public/resource_manager.h
similarity index 100%
rename from net/instaweb/rewriter/public/resource_manager.h
rename to src/net/instaweb/rewriter/public/resource_manager.h
diff --git a/net/instaweb/rewriter/public/resource_manager_test_base.h b/src/net/instaweb/rewriter/public/resource_manager_test_base.h
similarity index 100%
rename from net/instaweb/rewriter/public/resource_manager_test_base.h
rename to src/net/instaweb/rewriter/public/resource_manager_test_base.h
diff --git a/net/instaweb/rewriter/public/resource_namer.h b/src/net/instaweb/rewriter/public/resource_namer.h
similarity index 100%
rename from net/instaweb/rewriter/public/resource_namer.h
rename to src/net/instaweb/rewriter/public/resource_namer.h
diff --git a/net/instaweb/rewriter/public/resource_tag_scanner.h b/src/net/instaweb/rewriter/public/resource_tag_scanner.h
similarity index 100%
rename from net/instaweb/rewriter/public/resource_tag_scanner.h
rename to src/net/instaweb/rewriter/public/resource_tag_scanner.h
diff --git a/net/instaweb/rewriter/public/rewrite_driver.h b/src/net/instaweb/rewriter/public/rewrite_driver.h
similarity index 100%
rename from net/instaweb/rewriter/public/rewrite_driver.h
rename to src/net/instaweb/rewriter/public/rewrite_driver.h
diff --git a/net/instaweb/rewriter/public/rewrite_driver_factory.h b/src/net/instaweb/rewriter/public/rewrite_driver_factory.h
similarity index 100%
rename from net/instaweb/rewriter/public/rewrite_driver_factory.h
rename to src/net/instaweb/rewriter/public/rewrite_driver_factory.h
diff --git a/net/instaweb/rewriter/public/rewrite_filter.h b/src/net/instaweb/rewriter/public/rewrite_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/rewrite_filter.h
rename to src/net/instaweb/rewriter/public/rewrite_filter.h
diff --git a/net/instaweb/rewriter/public/rewrite_options.h b/src/net/instaweb/rewriter/public/rewrite_options.h
similarity index 100%
rename from net/instaweb/rewriter/public/rewrite_options.h
rename to src/net/instaweb/rewriter/public/rewrite_options.h
diff --git a/net/instaweb/rewriter/public/script_tag_scanner.h b/src/net/instaweb/rewriter/public/script_tag_scanner.h
similarity index 100%
rename from net/instaweb/rewriter/public/script_tag_scanner.h
rename to src/net/instaweb/rewriter/public/script_tag_scanner.h
diff --git a/net/instaweb/rewriter/public/strip_scripts_filter.h b/src/net/instaweb/rewriter/public/strip_scripts_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/strip_scripts_filter.h
rename to src/net/instaweb/rewriter/public/strip_scripts_filter.h
diff --git a/net/instaweb/rewriter/public/url_input_resource.h b/src/net/instaweb/rewriter/public/url_input_resource.h
similarity index 100%
rename from net/instaweb/rewriter/public/url_input_resource.h
rename to src/net/instaweb/rewriter/public/url_input_resource.h
diff --git a/net/instaweb/rewriter/public/url_left_trim_filter.h b/src/net/instaweb/rewriter/public/url_left_trim_filter.h
similarity index 100%
rename from net/instaweb/rewriter/public/url_left_trim_filter.h
rename to src/net/instaweb/rewriter/public/url_left_trim_filter.h
diff --git a/net/instaweb/rewriter/public/url_partnership.h b/src/net/instaweb/rewriter/public/url_partnership.h
similarity index 100%
rename from net/instaweb/rewriter/public/url_partnership.h
rename to src/net/instaweb/rewriter/public/url_partnership.h
diff --git a/net/instaweb/rewriter/remove_comments_filter.cc b/src/net/instaweb/rewriter/remove_comments_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/remove_comments_filter.cc
rename to src/net/instaweb/rewriter/remove_comments_filter.cc
diff --git a/net/instaweb/rewriter/remove_comments_filter_test.cc b/src/net/instaweb/rewriter/remove_comments_filter_test.cc
similarity index 100%
rename from net/instaweb/rewriter/remove_comments_filter_test.cc
rename to src/net/instaweb/rewriter/remove_comments_filter_test.cc
diff --git a/net/instaweb/rewriter/resource.cc b/src/net/instaweb/rewriter/resource.cc
similarity index 100%
rename from net/instaweb/rewriter/resource.cc
rename to src/net/instaweb/rewriter/resource.cc
diff --git a/net/instaweb/rewriter/resource_manager.cc b/src/net/instaweb/rewriter/resource_manager.cc
similarity index 100%
rename from net/instaweb/rewriter/resource_manager.cc
rename to src/net/instaweb/rewriter/resource_manager.cc
diff --git a/net/instaweb/rewriter/resource_manager_test.cc b/src/net/instaweb/rewriter/resource_manager_test.cc
similarity index 100%
rename from net/instaweb/rewriter/resource_manager_test.cc
rename to src/net/instaweb/rewriter/resource_manager_test.cc
diff --git a/net/instaweb/rewriter/resource_manager_testing_peer.h b/src/net/instaweb/rewriter/resource_manager_testing_peer.h
similarity index 100%
rename from net/instaweb/rewriter/resource_manager_testing_peer.h
rename to src/net/instaweb/rewriter/resource_manager_testing_peer.h
diff --git a/net/instaweb/rewriter/resource_namer.cc b/src/net/instaweb/rewriter/resource_namer.cc
similarity index 100%
rename from net/instaweb/rewriter/resource_namer.cc
rename to src/net/instaweb/rewriter/resource_namer.cc
diff --git a/net/instaweb/rewriter/resource_namer_test.cc b/src/net/instaweb/rewriter/resource_namer_test.cc
similarity index 100%
rename from net/instaweb/rewriter/resource_namer_test.cc
rename to src/net/instaweb/rewriter/resource_namer_test.cc
diff --git a/net/instaweb/rewriter/resource_tag_scanner.cc b/src/net/instaweb/rewriter/resource_tag_scanner.cc
similarity index 100%
rename from net/instaweb/rewriter/resource_tag_scanner.cc
rename to src/net/instaweb/rewriter/resource_tag_scanner.cc
diff --git a/net/instaweb/rewriter/resource_tag_scanner_test.cc b/src/net/instaweb/rewriter/resource_tag_scanner_test.cc
similarity index 100%
rename from net/instaweb/rewriter/resource_tag_scanner_test.cc
rename to src/net/instaweb/rewriter/resource_tag_scanner_test.cc
diff --git a/net/instaweb/rewriter/rewrite.proto b/src/net/instaweb/rewriter/rewrite.proto
similarity index 100%
rename from net/instaweb/rewriter/rewrite.proto
rename to src/net/instaweb/rewriter/rewrite.proto
diff --git a/net/instaweb/rewriter/rewrite_driver.cc b/src/net/instaweb/rewriter/rewrite_driver.cc
similarity index 100%
rename from net/instaweb/rewriter/rewrite_driver.cc
rename to src/net/instaweb/rewriter/rewrite_driver.cc
diff --git a/net/instaweb/rewriter/rewrite_driver_factory.cc b/src/net/instaweb/rewriter/rewrite_driver_factory.cc
similarity index 100%
rename from net/instaweb/rewriter/rewrite_driver_factory.cc
rename to src/net/instaweb/rewriter/rewrite_driver_factory.cc
diff --git a/net/instaweb/rewriter/rewrite_driver_test.cc b/src/net/instaweb/rewriter/rewrite_driver_test.cc
similarity index 100%
rename from net/instaweb/rewriter/rewrite_driver_test.cc
rename to src/net/instaweb/rewriter/rewrite_driver_test.cc
diff --git a/net/instaweb/rewriter/rewrite_filter.cc b/src/net/instaweb/rewriter/rewrite_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/rewrite_filter.cc
rename to src/net/instaweb/rewriter/rewrite_filter.cc
diff --git a/net/instaweb/rewriter/rewrite_options.cc b/src/net/instaweb/rewriter/rewrite_options.cc
similarity index 100%
rename from net/instaweb/rewriter/rewrite_options.cc
rename to src/net/instaweb/rewriter/rewrite_options.cc
diff --git a/net/instaweb/rewriter/rewrite_options_test.cc b/src/net/instaweb/rewriter/rewrite_options_test.cc
similarity index 100%
rename from net/instaweb/rewriter/rewrite_options_test.cc
rename to src/net/instaweb/rewriter/rewrite_options_test.cc
diff --git a/net/instaweb/rewriter/rewriter_test.cc b/src/net/instaweb/rewriter/rewriter_test.cc
similarity index 100%
rename from net/instaweb/rewriter/rewriter_test.cc
rename to src/net/instaweb/rewriter/rewriter_test.cc
diff --git a/net/instaweb/rewriter/script_tag_scanner.cc b/src/net/instaweb/rewriter/script_tag_scanner.cc
similarity index 100%
rename from net/instaweb/rewriter/script_tag_scanner.cc
rename to src/net/instaweb/rewriter/script_tag_scanner.cc
diff --git a/net/instaweb/rewriter/script_tag_scanner_test.cc b/src/net/instaweb/rewriter/script_tag_scanner_test.cc
similarity index 100%
rename from net/instaweb/rewriter/script_tag_scanner_test.cc
rename to src/net/instaweb/rewriter/script_tag_scanner_test.cc
diff --git a/net/instaweb/rewriter/strip_scripts_filter.cc b/src/net/instaweb/rewriter/strip_scripts_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/strip_scripts_filter.cc
rename to src/net/instaweb/rewriter/strip_scripts_filter.cc
diff --git a/net/instaweb/rewriter/strip_scripts_filter_test.cc b/src/net/instaweb/rewriter/strip_scripts_filter_test.cc
similarity index 100%
rename from net/instaweb/rewriter/strip_scripts_filter_test.cc
rename to src/net/instaweb/rewriter/strip_scripts_filter_test.cc
diff --git a/net/instaweb/rewriter/url_input_resource.cc b/src/net/instaweb/rewriter/url_input_resource.cc
similarity index 100%
rename from net/instaweb/rewriter/url_input_resource.cc
rename to src/net/instaweb/rewriter/url_input_resource.cc
diff --git a/net/instaweb/rewriter/url_left_trim_filter.cc b/src/net/instaweb/rewriter/url_left_trim_filter.cc
similarity index 100%
rename from net/instaweb/rewriter/url_left_trim_filter.cc
rename to src/net/instaweb/rewriter/url_left_trim_filter.cc
diff --git a/net/instaweb/rewriter/url_left_trim_filter_test.cc b/src/net/instaweb/rewriter/url_left_trim_filter_test.cc
similarity index 100%
rename from net/instaweb/rewriter/url_left_trim_filter_test.cc
rename to src/net/instaweb/rewriter/url_left_trim_filter_test.cc
diff --git a/net/instaweb/rewriter/url_partnership.cc b/src/net/instaweb/rewriter/url_partnership.cc
similarity index 100%
rename from net/instaweb/rewriter/url_partnership.cc
rename to src/net/instaweb/rewriter/url_partnership.cc
diff --git a/net/instaweb/rewriter/url_partnership_test.cc b/src/net/instaweb/rewriter/url_partnership_test.cc
similarity index 100%
rename from net/instaweb/rewriter/url_partnership_test.cc
rename to src/net/instaweb/rewriter/url_partnership_test.cc
diff --git a/net/instaweb/util/abstract_mutex.cc b/src/net/instaweb/util/abstract_mutex.cc
similarity index 100%
rename from net/instaweb/util/abstract_mutex.cc
rename to src/net/instaweb/util/abstract_mutex.cc
diff --git a/net/instaweb/util/base64_test.cc b/src/net/instaweb/util/base64_test.cc
similarity index 100%
rename from net/instaweb/util/base64_test.cc
rename to src/net/instaweb/util/base64_test.cc
diff --git a/net/instaweb/util/cache_fetcher_test.cc b/src/net/instaweb/util/cache_fetcher_test.cc
similarity index 100%
rename from net/instaweb/util/cache_fetcher_test.cc
rename to src/net/instaweb/util/cache_fetcher_test.cc
diff --git a/net/instaweb/util/cache_fetcher_test.h b/src/net/instaweb/util/cache_fetcher_test.h
similarity index 100%
rename from net/instaweb/util/cache_fetcher_test.h
rename to src/net/instaweb/util/cache_fetcher_test.h
diff --git a/net/instaweb/util/cache_interface.cc b/src/net/instaweb/util/cache_interface.cc
similarity index 100%
rename from net/instaweb/util/cache_interface.cc
rename to src/net/instaweb/util/cache_interface.cc
diff --git a/net/instaweb/util/cache_url_async_fetcher.cc b/src/net/instaweb/util/cache_url_async_fetcher.cc
similarity index 100%
rename from net/instaweb/util/cache_url_async_fetcher.cc
rename to src/net/instaweb/util/cache_url_async_fetcher.cc
diff --git a/net/instaweb/util/cache_url_async_fetcher_test.cc b/src/net/instaweb/util/cache_url_async_fetcher_test.cc
similarity index 100%
rename from net/instaweb/util/cache_url_async_fetcher_test.cc
rename to src/net/instaweb/util/cache_url_async_fetcher_test.cc
diff --git a/net/instaweb/util/cache_url_fetcher.cc b/src/net/instaweb/util/cache_url_fetcher.cc
similarity index 100%
rename from net/instaweb/util/cache_url_fetcher.cc
rename to src/net/instaweb/util/cache_url_fetcher.cc
diff --git a/net/instaweb/util/cache_url_fetcher_test.cc b/src/net/instaweb/util/cache_url_fetcher_test.cc
similarity index 100%
rename from net/instaweb/util/cache_url_fetcher_test.cc
rename to src/net/instaweb/util/cache_url_fetcher_test.cc
diff --git a/net/instaweb/util/content_type.cc b/src/net/instaweb/util/content_type.cc
similarity index 100%
rename from net/instaweb/util/content_type.cc
rename to src/net/instaweb/util/content_type.cc
diff --git a/net/instaweb/util/data_url.cc b/src/net/instaweb/util/data_url.cc
similarity index 100%
rename from net/instaweb/util/data_url.cc
rename to src/net/instaweb/util/data_url.cc
diff --git a/net/instaweb/util/data_url_test.cc b/src/net/instaweb/util/data_url_test.cc
similarity index 100%
rename from net/instaweb/util/data_url_test.cc
rename to src/net/instaweb/util/data_url_test.cc
diff --git a/net/instaweb/util/dummy_url_fetcher.cc b/src/net/instaweb/util/dummy_url_fetcher.cc
similarity index 100%
rename from net/instaweb/util/dummy_url_fetcher.cc
rename to src/net/instaweb/util/dummy_url_fetcher.cc
diff --git a/net/instaweb/util/fake_url_async_fetcher.cc b/src/net/instaweb/util/fake_url_async_fetcher.cc
similarity index 100%
rename from net/instaweb/util/fake_url_async_fetcher.cc
rename to src/net/instaweb/util/fake_url_async_fetcher.cc
diff --git a/net/instaweb/util/fetcher_test.cc b/src/net/instaweb/util/fetcher_test.cc
similarity index 100%
rename from net/instaweb/util/fetcher_test.cc
rename to src/net/instaweb/util/fetcher_test.cc
diff --git a/net/instaweb/util/fetcher_test.h b/src/net/instaweb/util/fetcher_test.h
similarity index 100%
rename from net/instaweb/util/fetcher_test.h
rename to src/net/instaweb/util/fetcher_test.h
diff --git a/net/instaweb/util/file_cache.cc b/src/net/instaweb/util/file_cache.cc
similarity index 100%
rename from net/instaweb/util/file_cache.cc
rename to src/net/instaweb/util/file_cache.cc
diff --git a/net/instaweb/util/file_cache_test.cc b/src/net/instaweb/util/file_cache_test.cc
similarity index 100%
rename from net/instaweb/util/file_cache_test.cc
rename to src/net/instaweb/util/file_cache_test.cc
diff --git a/net/instaweb/util/file_message_handler.cc b/src/net/instaweb/util/file_message_handler.cc
similarity index 100%
rename from net/instaweb/util/file_message_handler.cc
rename to src/net/instaweb/util/file_message_handler.cc
diff --git a/net/instaweb/util/file_system.cc b/src/net/instaweb/util/file_system.cc
similarity index 100%
rename from net/instaweb/util/file_system.cc
rename to src/net/instaweb/util/file_system.cc
diff --git a/net/instaweb/util/file_system_test.cc b/src/net/instaweb/util/file_system_test.cc
similarity index 100%
rename from net/instaweb/util/file_system_test.cc
rename to src/net/instaweb/util/file_system_test.cc
diff --git a/net/instaweb/util/file_writer.cc b/src/net/instaweb/util/file_writer.cc
similarity index 100%
rename from net/instaweb/util/file_writer.cc
rename to src/net/instaweb/util/file_writer.cc
diff --git a/net/instaweb/util/filename_encoder.cc b/src/net/instaweb/util/filename_encoder.cc
similarity index 100%
rename from net/instaweb/util/filename_encoder.cc
rename to src/net/instaweb/util/filename_encoder.cc
diff --git a/net/instaweb/util/filename_encoder_test.cc b/src/net/instaweb/util/filename_encoder_test.cc
similarity index 100%
rename from net/instaweb/util/filename_encoder_test.cc
rename to src/net/instaweb/util/filename_encoder_test.cc
diff --git a/net/instaweb/util/google_message_handler.cc b/src/net/instaweb/util/google_message_handler.cc
similarity index 100%
rename from net/instaweb/util/google_message_handler.cc
rename to src/net/instaweb/util/google_message_handler.cc
diff --git a/net/instaweb/util/google_url.cc b/src/net/instaweb/util/google_url.cc
similarity index 100%
rename from net/instaweb/util/google_url.cc
rename to src/net/instaweb/util/google_url.cc
diff --git a/net/instaweb/util/google_url_test.cc b/src/net/instaweb/util/google_url_test.cc
similarity index 100%
rename from net/instaweb/util/google_url_test.cc
rename to src/net/instaweb/util/google_url_test.cc
diff --git a/net/instaweb/util/gtest.cc b/src/net/instaweb/util/gtest.cc
similarity index 100%
rename from net/instaweb/util/gtest.cc
rename to src/net/instaweb/util/gtest.cc
diff --git a/net/instaweb/util/gzip_inflater.cc b/src/net/instaweb/util/gzip_inflater.cc
similarity index 100%
rename from net/instaweb/util/gzip_inflater.cc
rename to src/net/instaweb/util/gzip_inflater.cc
diff --git a/net/instaweb/util/gzip_inflater_test.cc b/src/net/instaweb/util/gzip_inflater_test.cc
similarity index 100%
rename from net/instaweb/util/gzip_inflater_test.cc
rename to src/net/instaweb/util/gzip_inflater_test.cc
diff --git a/net/instaweb/util/hasher.cc b/src/net/instaweb/util/hasher.cc
similarity index 100%
rename from net/instaweb/util/hasher.cc
rename to src/net/instaweb/util/hasher.cc
diff --git a/net/instaweb/util/http_cache.cc b/src/net/instaweb/util/http_cache.cc
similarity index 100%
rename from net/instaweb/util/http_cache.cc
rename to src/net/instaweb/util/http_cache.cc
diff --git a/net/instaweb/util/http_cache_test.cc b/src/net/instaweb/util/http_cache_test.cc
similarity index 100%
rename from net/instaweb/util/http_cache_test.cc
rename to src/net/instaweb/util/http_cache_test.cc
diff --git a/net/instaweb/util/http_dump_url_async_writer.cc b/src/net/instaweb/util/http_dump_url_async_writer.cc
similarity index 100%
rename from net/instaweb/util/http_dump_url_async_writer.cc
rename to src/net/instaweb/util/http_dump_url_async_writer.cc
diff --git a/net/instaweb/util/http_dump_url_async_writer_test.cc b/src/net/instaweb/util/http_dump_url_async_writer_test.cc
similarity index 100%
rename from net/instaweb/util/http_dump_url_async_writer_test.cc
rename to src/net/instaweb/util/http_dump_url_async_writer_test.cc
diff --git a/net/instaweb/util/http_dump_url_fetcher.cc b/src/net/instaweb/util/http_dump_url_fetcher.cc
similarity index 100%
rename from net/instaweb/util/http_dump_url_fetcher.cc
rename to src/net/instaweb/util/http_dump_url_fetcher.cc
diff --git a/net/instaweb/util/http_dump_url_fetcher_test.cc b/src/net/instaweb/util/http_dump_url_fetcher_test.cc
similarity index 100%
rename from net/instaweb/util/http_dump_url_fetcher_test.cc
rename to src/net/instaweb/util/http_dump_url_fetcher_test.cc
diff --git a/net/instaweb/util/http_dump_url_writer.cc b/src/net/instaweb/util/http_dump_url_writer.cc
similarity index 100%
rename from net/instaweb/util/http_dump_url_writer.cc
rename to src/net/instaweb/util/http_dump_url_writer.cc
diff --git a/net/instaweb/util/http_dump_url_writer_test.cc b/src/net/instaweb/util/http_dump_url_writer_test.cc
similarity index 100%
rename from net/instaweb/util/http_dump_url_writer_test.cc
rename to src/net/instaweb/util/http_dump_url_writer_test.cc
diff --git a/net/instaweb/util/http_response_parser.cc b/src/net/instaweb/util/http_response_parser.cc
similarity index 100%
rename from net/instaweb/util/http_response_parser.cc
rename to src/net/instaweb/util/http_response_parser.cc
diff --git a/net/instaweb/util/http_value.cc b/src/net/instaweb/util/http_value.cc
similarity index 100%
rename from net/instaweb/util/http_value.cc
rename to src/net/instaweb/util/http_value.cc
diff --git a/net/instaweb/util/http_value_test.cc b/src/net/instaweb/util/http_value_test.cc
similarity index 100%
rename from net/instaweb/util/http_value_test.cc
rename to src/net/instaweb/util/http_value_test.cc
diff --git a/net/instaweb/util/lru_cache.cc b/src/net/instaweb/util/lru_cache.cc
similarity index 100%
rename from net/instaweb/util/lru_cache.cc
rename to src/net/instaweb/util/lru_cache.cc
diff --git a/net/instaweb/util/lru_cache_test.cc b/src/net/instaweb/util/lru_cache_test.cc
similarity index 100%
rename from net/instaweb/util/lru_cache_test.cc
rename to src/net/instaweb/util/lru_cache_test.cc
diff --git a/net/instaweb/util/md5_hasher.cc b/src/net/instaweb/util/md5_hasher.cc
similarity index 100%
rename from net/instaweb/util/md5_hasher.cc
rename to src/net/instaweb/util/md5_hasher.cc
diff --git a/net/instaweb/util/mem_file_system.cc b/src/net/instaweb/util/mem_file_system.cc
similarity index 100%
rename from net/instaweb/util/mem_file_system.cc
rename to src/net/instaweb/util/mem_file_system.cc
diff --git a/net/instaweb/util/mem_file_system_test.cc b/src/net/instaweb/util/mem_file_system_test.cc
similarity index 100%
rename from net/instaweb/util/mem_file_system_test.cc
rename to src/net/instaweb/util/mem_file_system_test.cc
diff --git a/net/instaweb/util/message_handler.cc b/src/net/instaweb/util/message_handler.cc
similarity index 100%
rename from net/instaweb/util/message_handler.cc
rename to src/net/instaweb/util/message_handler.cc
diff --git a/net/instaweb/util/message_handler_test.cc b/src/net/instaweb/util/message_handler_test.cc
similarity index 100%
rename from net/instaweb/util/message_handler_test.cc
rename to src/net/instaweb/util/message_handler_test.cc
diff --git a/net/instaweb/util/meta_data.cc b/src/net/instaweb/util/meta_data.cc
similarity index 100%
rename from net/instaweb/util/meta_data.cc
rename to src/net/instaweb/util/meta_data.cc
diff --git a/net/instaweb/util/mock_hasher.cc b/src/net/instaweb/util/mock_hasher.cc
similarity index 100%
rename from net/instaweb/util/mock_hasher.cc
rename to src/net/instaweb/util/mock_hasher.cc
diff --git a/net/instaweb/util/mock_timer.cc b/src/net/instaweb/util/mock_timer.cc
similarity index 100%
rename from net/instaweb/util/mock_timer.cc
rename to src/net/instaweb/util/mock_timer.cc
diff --git a/net/instaweb/util/mock_url_fetcher.cc b/src/net/instaweb/util/mock_url_fetcher.cc
similarity index 100%
rename from net/instaweb/util/mock_url_fetcher.cc
rename to src/net/instaweb/util/mock_url_fetcher.cc
diff --git a/net/instaweb/util/mock_url_fetcher_test.cc b/src/net/instaweb/util/mock_url_fetcher_test.cc
similarity index 100%
rename from net/instaweb/util/mock_url_fetcher_test.cc
rename to src/net/instaweb/util/mock_url_fetcher_test.cc
diff --git a/net/instaweb/util/null_message_handler.cc b/src/net/instaweb/util/null_message_handler.cc
similarity index 100%
rename from net/instaweb/util/null_message_handler.cc
rename to src/net/instaweb/util/null_message_handler.cc
diff --git a/net/instaweb/util/pthread_mutex.cc b/src/net/instaweb/util/pthread_mutex.cc
similarity index 100%
rename from net/instaweb/util/pthread_mutex.cc
rename to src/net/instaweb/util/pthread_mutex.cc
diff --git a/net/instaweb/util/public/abstract_mutex.h b/src/net/instaweb/util/public/abstract_mutex.h
similarity index 100%
rename from net/instaweb/util/public/abstract_mutex.h
rename to src/net/instaweb/util/public/abstract_mutex.h
diff --git a/net/instaweb/util/public/atom.h b/src/net/instaweb/util/public/atom.h
similarity index 100%
rename from net/instaweb/util/public/atom.h
rename to src/net/instaweb/util/public/atom.h
diff --git a/net/instaweb/util/public/base64_util.h b/src/net/instaweb/util/public/base64_util.h
similarity index 100%
rename from net/instaweb/util/public/base64_util.h
rename to src/net/instaweb/util/public/base64_util.h
diff --git a/net/instaweb/util/public/cache_interface.h b/src/net/instaweb/util/public/cache_interface.h
similarity index 100%
rename from net/instaweb/util/public/cache_interface.h
rename to src/net/instaweb/util/public/cache_interface.h
diff --git a/net/instaweb/util/public/cache_url_async_fetcher.h b/src/net/instaweb/util/public/cache_url_async_fetcher.h
similarity index 100%
rename from net/instaweb/util/public/cache_url_async_fetcher.h
rename to src/net/instaweb/util/public/cache_url_async_fetcher.h
diff --git a/net/instaweb/util/public/cache_url_fetcher.h b/src/net/instaweb/util/public/cache_url_fetcher.h
similarity index 100%
rename from net/instaweb/util/public/cache_url_fetcher.h
rename to src/net/instaweb/util/public/cache_url_fetcher.h
diff --git a/net/instaweb/util/public/content_type.h b/src/net/instaweb/util/public/content_type.h
similarity index 100%
rename from net/instaweb/util/public/content_type.h
rename to src/net/instaweb/util/public/content_type.h
diff --git a/net/instaweb/util/public/data_url.h b/src/net/instaweb/util/public/data_url.h
similarity index 100%
rename from net/instaweb/util/public/data_url.h
rename to src/net/instaweb/util/public/data_url.h
diff --git a/net/instaweb/util/public/dense_hash_set.h b/src/net/instaweb/util/public/dense_hash_set.h
similarity index 100%
rename from net/instaweb/util/public/dense_hash_set.h
rename to src/net/instaweb/util/public/dense_hash_set.h
diff --git a/net/instaweb/util/public/dummy_url_fetcher.h b/src/net/instaweb/util/public/dummy_url_fetcher.h
similarity index 100%
rename from net/instaweb/util/public/dummy_url_fetcher.h
rename to src/net/instaweb/util/public/dummy_url_fetcher.h
diff --git a/net/instaweb/util/public/fake_url_async_fetcher.h b/src/net/instaweb/util/public/fake_url_async_fetcher.h
similarity index 100%
rename from net/instaweb/util/public/fake_url_async_fetcher.h
rename to src/net/instaweb/util/public/fake_url_async_fetcher.h
diff --git a/net/instaweb/util/public/file_cache.h b/src/net/instaweb/util/public/file_cache.h
similarity index 100%
rename from net/instaweb/util/public/file_cache.h
rename to src/net/instaweb/util/public/file_cache.h
diff --git a/net/instaweb/util/public/file_message_handler.h b/src/net/instaweb/util/public/file_message_handler.h
similarity index 100%
rename from net/instaweb/util/public/file_message_handler.h
rename to src/net/instaweb/util/public/file_message_handler.h
diff --git a/net/instaweb/util/public/file_system.h b/src/net/instaweb/util/public/file_system.h
similarity index 100%
rename from net/instaweb/util/public/file_system.h
rename to src/net/instaweb/util/public/file_system.h
diff --git a/net/instaweb/util/public/file_system_test.h b/src/net/instaweb/util/public/file_system_test.h
similarity index 100%
rename from net/instaweb/util/public/file_system_test.h
rename to src/net/instaweb/util/public/file_system_test.h
diff --git a/net/instaweb/util/public/file_writer.h b/src/net/instaweb/util/public/file_writer.h
similarity index 100%
rename from net/instaweb/util/public/file_writer.h
rename to src/net/instaweb/util/public/file_writer.h
diff --git a/net/instaweb/util/public/filename_encoder.h b/src/net/instaweb/util/public/filename_encoder.h
similarity index 100%
rename from net/instaweb/util/public/filename_encoder.h
rename to src/net/instaweb/util/public/filename_encoder.h
diff --git a/net/instaweb/util/public/google_message_handler.h b/src/net/instaweb/util/public/google_message_handler.h
similarity index 100%
rename from net/instaweb/util/public/google_message_handler.h
rename to src/net/instaweb/util/public/google_message_handler.h
diff --git a/net/instaweb/util/public/google_url.h b/src/net/instaweb/util/public/google_url.h
similarity index 100%
rename from net/instaweb/util/public/google_url.h
rename to src/net/instaweb/util/public/google_url.h
diff --git a/net/instaweb/util/public/gtest.h b/src/net/instaweb/util/public/gtest.h
similarity index 100%
rename from net/instaweb/util/public/gtest.h
rename to src/net/instaweb/util/public/gtest.h
diff --git a/net/instaweb/util/public/gzip_inflater.h b/src/net/instaweb/util/public/gzip_inflater.h
similarity index 100%
rename from net/instaweb/util/public/gzip_inflater.h
rename to src/net/instaweb/util/public/gzip_inflater.h
diff --git a/net/instaweb/util/public/hasher.h b/src/net/instaweb/util/public/hasher.h
similarity index 100%
rename from net/instaweb/util/public/hasher.h
rename to src/net/instaweb/util/public/hasher.h
diff --git a/net/instaweb/util/public/http_cache.h b/src/net/instaweb/util/public/http_cache.h
similarity index 100%
rename from net/instaweb/util/public/http_cache.h
rename to src/net/instaweb/util/public/http_cache.h
diff --git a/net/instaweb/util/public/http_dump_url_async_writer.h b/src/net/instaweb/util/public/http_dump_url_async_writer.h
similarity index 100%
rename from net/instaweb/util/public/http_dump_url_async_writer.h
rename to src/net/instaweb/util/public/http_dump_url_async_writer.h
diff --git a/net/instaweb/util/public/http_dump_url_fetcher.h b/src/net/instaweb/util/public/http_dump_url_fetcher.h
similarity index 100%
rename from net/instaweb/util/public/http_dump_url_fetcher.h
rename to src/net/instaweb/util/public/http_dump_url_fetcher.h
diff --git a/net/instaweb/util/public/http_dump_url_writer.h b/src/net/instaweb/util/public/http_dump_url_writer.h
similarity index 100%
rename from net/instaweb/util/public/http_dump_url_writer.h
rename to src/net/instaweb/util/public/http_dump_url_writer.h
diff --git a/net/instaweb/util/public/http_response_parser.h b/src/net/instaweb/util/public/http_response_parser.h
similarity index 100%
rename from net/instaweb/util/public/http_response_parser.h
rename to src/net/instaweb/util/public/http_response_parser.h
diff --git a/net/instaweb/util/public/http_value.h b/src/net/instaweb/util/public/http_value.h
similarity index 100%
rename from net/instaweb/util/public/http_value.h
rename to src/net/instaweb/util/public/http_value.h
diff --git a/net/instaweb/util/public/lru_cache.h b/src/net/instaweb/util/public/lru_cache.h
similarity index 100%
rename from net/instaweb/util/public/lru_cache.h
rename to src/net/instaweb/util/public/lru_cache.h
diff --git a/net/instaweb/util/public/md5_hasher.h b/src/net/instaweb/util/public/md5_hasher.h
similarity index 100%
rename from net/instaweb/util/public/md5_hasher.h
rename to src/net/instaweb/util/public/md5_hasher.h
diff --git a/net/instaweb/util/public/mem_file_system.h b/src/net/instaweb/util/public/mem_file_system.h
similarity index 100%
rename from net/instaweb/util/public/mem_file_system.h
rename to src/net/instaweb/util/public/mem_file_system.h
diff --git a/net/instaweb/util/public/message_handler.h b/src/net/instaweb/util/public/message_handler.h
similarity index 100%
rename from net/instaweb/util/public/message_handler.h
rename to src/net/instaweb/util/public/message_handler.h
diff --git a/net/instaweb/util/public/meta_data.h b/src/net/instaweb/util/public/meta_data.h
similarity index 100%
rename from net/instaweb/util/public/meta_data.h
rename to src/net/instaweb/util/public/meta_data.h
diff --git a/net/instaweb/util/public/mock_hasher.h b/src/net/instaweb/util/public/mock_hasher.h
similarity index 100%
rename from net/instaweb/util/public/mock_hasher.h
rename to src/net/instaweb/util/public/mock_hasher.h
diff --git a/net/instaweb/util/public/mock_timer.h b/src/net/instaweb/util/public/mock_timer.h
similarity index 100%
rename from net/instaweb/util/public/mock_timer.h
rename to src/net/instaweb/util/public/mock_timer.h
diff --git a/net/instaweb/util/public/mock_url_fetcher.h b/src/net/instaweb/util/public/mock_url_fetcher.h
similarity index 100%
rename from net/instaweb/util/public/mock_url_fetcher.h
rename to src/net/instaweb/util/public/mock_url_fetcher.h
diff --git a/net/instaweb/util/public/null_message_handler.h b/src/net/instaweb/util/public/null_message_handler.h
similarity index 100%
rename from net/instaweb/util/public/null_message_handler.h
rename to src/net/instaweb/util/public/null_message_handler.h
diff --git a/net/instaweb/util/public/printf_format.h b/src/net/instaweb/util/public/printf_format.h
similarity index 100%
rename from net/instaweb/util/public/printf_format.h
rename to src/net/instaweb/util/public/printf_format.h
diff --git a/net/instaweb/util/public/proto_util.h b/src/net/instaweb/util/public/proto_util.h
similarity index 100%
rename from net/instaweb/util/public/proto_util.h
rename to src/net/instaweb/util/public/proto_util.h
diff --git a/net/instaweb/util/public/pthread_mutex.h b/src/net/instaweb/util/public/pthread_mutex.h
similarity index 100%
rename from net/instaweb/util/public/pthread_mutex.h
rename to src/net/instaweb/util/public/pthread_mutex.h
diff --git a/net/instaweb/util/public/query_params.h b/src/net/instaweb/util/public/query_params.h
similarity index 100%
rename from net/instaweb/util/public/query_params.h
rename to src/net/instaweb/util/public/query_params.h
diff --git a/net/instaweb/util/public/rolling_hash.h b/src/net/instaweb/util/public/rolling_hash.h
similarity index 100%
rename from net/instaweb/util/public/rolling_hash.h
rename to src/net/instaweb/util/public/rolling_hash.h
diff --git a/net/instaweb/util/public/shared_string.h b/src/net/instaweb/util/public/shared_string.h
similarity index 100%
rename from net/instaweb/util/public/shared_string.h
rename to src/net/instaweb/util/public/shared_string.h
diff --git a/net/instaweb/util/public/simple_meta_data.h b/src/net/instaweb/util/public/simple_meta_data.h
similarity index 100%
rename from net/instaweb/util/public/simple_meta_data.h
rename to src/net/instaweb/util/public/simple_meta_data.h
diff --git a/net/instaweb/util/public/simple_stats.h b/src/net/instaweb/util/public/simple_stats.h
similarity index 100%
rename from net/instaweb/util/public/simple_stats.h
rename to src/net/instaweb/util/public/simple_stats.h
diff --git a/net/instaweb/util/public/statistics.h b/src/net/instaweb/util/public/statistics.h
similarity index 100%
rename from net/instaweb/util/public/statistics.h
rename to src/net/instaweb/util/public/statistics.h
diff --git a/net/instaweb/util/public/statistics_template.h b/src/net/instaweb/util/public/statistics_template.h
similarity index 100%
rename from net/instaweb/util/public/statistics_template.h
rename to src/net/instaweb/util/public/statistics_template.h
diff --git a/net/instaweb/util/public/stdio_file_system.h b/src/net/instaweb/util/public/stdio_file_system.h
similarity index 100%
rename from net/instaweb/util/public/stdio_file_system.h
rename to src/net/instaweb/util/public/stdio_file_system.h
diff --git a/net/instaweb/util/public/stl_util.h b/src/net/instaweb/util/public/stl_util.h
similarity index 100%
rename from net/instaweb/util/public/stl_util.h
rename to src/net/instaweb/util/public/stl_util.h
diff --git a/net/instaweb/util/public/string_buffer.h b/src/net/instaweb/util/public/string_buffer.h
similarity index 100%
rename from net/instaweb/util/public/string_buffer.h
rename to src/net/instaweb/util/public/string_buffer.h
diff --git a/net/instaweb/util/public/string_buffer_writer.h b/src/net/instaweb/util/public/string_buffer_writer.h
similarity index 100%
rename from net/instaweb/util/public/string_buffer_writer.h
rename to src/net/instaweb/util/public/string_buffer_writer.h
diff --git a/net/instaweb/util/public/string_hash.h b/src/net/instaweb/util/public/string_hash.h
similarity index 100%
rename from net/instaweb/util/public/string_hash.h
rename to src/net/instaweb/util/public/string_hash.h
diff --git a/net/instaweb/util/public/string_util.h b/src/net/instaweb/util/public/string_util.h
similarity index 100%
rename from net/instaweb/util/public/string_util.h
rename to src/net/instaweb/util/public/string_util.h
diff --git a/net/instaweb/util/public/string_writer.h b/src/net/instaweb/util/public/string_writer.h
similarity index 100%
rename from net/instaweb/util/public/string_writer.h
rename to src/net/instaweb/util/public/string_writer.h
diff --git a/net/instaweb/util/public/symbol_table.h b/src/net/instaweb/util/public/symbol_table.h
similarity index 100%
rename from net/instaweb/util/public/symbol_table.h
rename to src/net/instaweb/util/public/symbol_table.h
diff --git a/net/instaweb/util/public/threadsafe_cache.h b/src/net/instaweb/util/public/threadsafe_cache.h
similarity index 100%
rename from net/instaweb/util/public/threadsafe_cache.h
rename to src/net/instaweb/util/public/threadsafe_cache.h
diff --git a/net/instaweb/util/public/time_util.h b/src/net/instaweb/util/public/time_util.h
similarity index 100%
rename from net/instaweb/util/public/time_util.h
rename to src/net/instaweb/util/public/time_util.h
diff --git a/net/instaweb/util/public/timer.h b/src/net/instaweb/util/public/timer.h
similarity index 100%
rename from net/instaweb/util/public/timer.h
rename to src/net/instaweb/util/public/timer.h
diff --git a/net/instaweb/util/public/url_async_fetcher.h b/src/net/instaweb/util/public/url_async_fetcher.h
similarity index 100%
rename from net/instaweb/util/public/url_async_fetcher.h
rename to src/net/instaweb/util/public/url_async_fetcher.h
diff --git a/net/instaweb/util/public/url_escaper.h b/src/net/instaweb/util/public/url_escaper.h
similarity index 100%
rename from net/instaweb/util/public/url_escaper.h
rename to src/net/instaweb/util/public/url_escaper.h
diff --git a/net/instaweb/util/public/url_fetcher.h b/src/net/instaweb/util/public/url_fetcher.h
similarity index 100%
rename from net/instaweb/util/public/url_fetcher.h
rename to src/net/instaweb/util/public/url_fetcher.h
diff --git a/net/instaweb/util/public/url_multipart_encoder.h b/src/net/instaweb/util/public/url_multipart_encoder.h
similarity index 100%
rename from net/instaweb/util/public/url_multipart_encoder.h
rename to src/net/instaweb/util/public/url_multipart_encoder.h
diff --git a/net/instaweb/util/public/url_segment_encoder.h b/src/net/instaweb/util/public/url_segment_encoder.h
similarity index 100%
rename from net/instaweb/util/public/url_segment_encoder.h
rename to src/net/instaweb/util/public/url_segment_encoder.h
diff --git a/net/instaweb/util/public/user_agent.h b/src/net/instaweb/util/public/user_agent.h
similarity index 100%
rename from net/instaweb/util/public/user_agent.h
rename to src/net/instaweb/util/public/user_agent.h
diff --git a/net/instaweb/util/public/wget_url_fetcher.h b/src/net/instaweb/util/public/wget_url_fetcher.h
similarity index 100%
rename from net/instaweb/util/public/wget_url_fetcher.h
rename to src/net/instaweb/util/public/wget_url_fetcher.h
diff --git a/net/instaweb/util/public/wildcard.h b/src/net/instaweb/util/public/wildcard.h
similarity index 100%
rename from net/instaweb/util/public/wildcard.h
rename to src/net/instaweb/util/public/wildcard.h
diff --git a/net/instaweb/util/public/write_through_cache.h b/src/net/instaweb/util/public/write_through_cache.h
similarity index 100%
rename from net/instaweb/util/public/write_through_cache.h
rename to src/net/instaweb/util/public/write_through_cache.h
diff --git a/net/instaweb/util/public/writer.h b/src/net/instaweb/util/public/writer.h
similarity index 100%
rename from net/instaweb/util/public/writer.h
rename to src/net/instaweb/util/public/writer.h
diff --git a/net/instaweb/util/query_params.cc b/src/net/instaweb/util/query_params.cc
similarity index 100%
rename from net/instaweb/util/query_params.cc
rename to src/net/instaweb/util/query_params.cc
diff --git a/net/instaweb/util/query_params_test.cc b/src/net/instaweb/util/query_params_test.cc
similarity index 100%
rename from net/instaweb/util/query_params_test.cc
rename to src/net/instaweb/util/query_params_test.cc
diff --git a/net/instaweb/util/ref_counted.cc b/src/net/instaweb/util/ref_counted.cc
similarity index 100%
rename from net/instaweb/util/ref_counted.cc
rename to src/net/instaweb/util/ref_counted.cc
diff --git a/net/instaweb/util/rolling_hash.cc b/src/net/instaweb/util/rolling_hash.cc
similarity index 100%
rename from net/instaweb/util/rolling_hash.cc
rename to src/net/instaweb/util/rolling_hash.cc
diff --git a/net/instaweb/util/rolling_hash_test.cc b/src/net/instaweb/util/rolling_hash_test.cc
similarity index 100%
rename from net/instaweb/util/rolling_hash_test.cc
rename to src/net/instaweb/util/rolling_hash_test.cc
diff --git a/net/instaweb/util/simple_meta_data.cc b/src/net/instaweb/util/simple_meta_data.cc
similarity index 100%
rename from net/instaweb/util/simple_meta_data.cc
rename to src/net/instaweb/util/simple_meta_data.cc
diff --git a/net/instaweb/util/simple_stats.cc b/src/net/instaweb/util/simple_stats.cc
similarity index 100%
rename from net/instaweb/util/simple_stats.cc
rename to src/net/instaweb/util/simple_stats.cc
diff --git a/net/instaweb/util/stack_buffer.h b/src/net/instaweb/util/stack_buffer.h
similarity index 100%
rename from net/instaweb/util/stack_buffer.h
rename to src/net/instaweb/util/stack_buffer.h
diff --git a/net/instaweb/util/statistics.cc b/src/net/instaweb/util/statistics.cc
similarity index 100%
rename from net/instaweb/util/statistics.cc
rename to src/net/instaweb/util/statistics.cc
diff --git a/net/instaweb/util/stdio_file_system.cc b/src/net/instaweb/util/stdio_file_system.cc
similarity index 100%
rename from net/instaweb/util/stdio_file_system.cc
rename to src/net/instaweb/util/stdio_file_system.cc
diff --git a/net/instaweb/util/string_buffer.cc b/src/net/instaweb/util/string_buffer.cc
similarity index 100%
rename from net/instaweb/util/string_buffer.cc
rename to src/net/instaweb/util/string_buffer.cc
diff --git a/net/instaweb/util/string_buffer_test.cc b/src/net/instaweb/util/string_buffer_test.cc
similarity index 100%
rename from net/instaweb/util/string_buffer_test.cc
rename to src/net/instaweb/util/string_buffer_test.cc
diff --git a/net/instaweb/util/string_buffer_writer.cc b/src/net/instaweb/util/string_buffer_writer.cc
similarity index 100%
rename from net/instaweb/util/string_buffer_writer.cc
rename to src/net/instaweb/util/string_buffer_writer.cc
diff --git a/net/instaweb/util/string_convert.cc b/src/net/instaweb/util/string_convert.cc
similarity index 100%
rename from net/instaweb/util/string_convert.cc
rename to src/net/instaweb/util/string_convert.cc
diff --git a/net/instaweb/util/string_util.cc b/src/net/instaweb/util/string_util.cc
similarity index 100%
rename from net/instaweb/util/string_util.cc
rename to src/net/instaweb/util/string_util.cc
diff --git a/net/instaweb/util/string_util_test.cc b/src/net/instaweb/util/string_util_test.cc
similarity index 100%
rename from net/instaweb/util/string_util_test.cc
rename to src/net/instaweb/util/string_util_test.cc
diff --git a/net/instaweb/util/string_writer.cc b/src/net/instaweb/util/string_writer.cc
similarity index 100%
rename from net/instaweb/util/string_writer.cc
rename to src/net/instaweb/util/string_writer.cc
diff --git a/net/instaweb/util/symbol_table_test.cc b/src/net/instaweb/util/symbol_table_test.cc
similarity index 100%
rename from net/instaweb/util/symbol_table_test.cc
rename to src/net/instaweb/util/symbol_table_test.cc
diff --git a/net/instaweb/util/threadsafe_cache.cc b/src/net/instaweb/util/threadsafe_cache.cc
similarity index 100%
rename from net/instaweb/util/threadsafe_cache.cc
rename to src/net/instaweb/util/threadsafe_cache.cc
diff --git a/net/instaweb/util/time_util.cc b/src/net/instaweb/util/time_util.cc
similarity index 100%
rename from net/instaweb/util/time_util.cc
rename to src/net/instaweb/util/time_util.cc
diff --git a/net/instaweb/util/time_util_test.cc b/src/net/instaweb/util/time_util_test.cc
similarity index 100%
rename from net/instaweb/util/time_util_test.cc
rename to src/net/instaweb/util/time_util_test.cc
diff --git a/net/instaweb/util/timer.cc b/src/net/instaweb/util/timer.cc
similarity index 100%
rename from net/instaweb/util/timer.cc
rename to src/net/instaweb/util/timer.cc
diff --git a/net/instaweb/util/url_async_fetcher.cc b/src/net/instaweb/util/url_async_fetcher.cc
similarity index 100%
rename from net/instaweb/util/url_async_fetcher.cc
rename to src/net/instaweb/util/url_async_fetcher.cc
diff --git a/net/instaweb/util/url_escaper.cc b/src/net/instaweb/util/url_escaper.cc
similarity index 100%
rename from net/instaweb/util/url_escaper.cc
rename to src/net/instaweb/util/url_escaper.cc
diff --git a/net/instaweb/util/url_escaper_test.cc b/src/net/instaweb/util/url_escaper_test.cc
similarity index 100%
rename from net/instaweb/util/url_escaper_test.cc
rename to src/net/instaweb/util/url_escaper_test.cc
diff --git a/net/instaweb/util/url_fetcher.cc b/src/net/instaweb/util/url_fetcher.cc
similarity index 100%
rename from net/instaweb/util/url_fetcher.cc
rename to src/net/instaweb/util/url_fetcher.cc
diff --git a/net/instaweb/util/url_multipart_encoder.cc b/src/net/instaweb/util/url_multipart_encoder.cc
similarity index 100%
rename from net/instaweb/util/url_multipart_encoder.cc
rename to src/net/instaweb/util/url_multipart_encoder.cc
diff --git a/net/instaweb/util/url_multipart_encoder_test.cc b/src/net/instaweb/util/url_multipart_encoder_test.cc
similarity index 100%
rename from net/instaweb/util/url_multipart_encoder_test.cc
rename to src/net/instaweb/util/url_multipart_encoder_test.cc
diff --git a/net/instaweb/util/url_segment_encoder.cc b/src/net/instaweb/util/url_segment_encoder.cc
similarity index 100%
rename from net/instaweb/util/url_segment_encoder.cc
rename to src/net/instaweb/util/url_segment_encoder.cc
diff --git a/net/instaweb/util/user_agent.cc b/src/net/instaweb/util/user_agent.cc
similarity index 100%
rename from net/instaweb/util/user_agent.cc
rename to src/net/instaweb/util/user_agent.cc
diff --git a/net/instaweb/util/user_agent_test.cc b/src/net/instaweb/util/user_agent_test.cc
similarity index 100%
rename from net/instaweb/util/user_agent_test.cc
rename to src/net/instaweb/util/user_agent_test.cc
diff --git a/net/instaweb/util/util.proto b/src/net/instaweb/util/util.proto
similarity index 100%
rename from net/instaweb/util/util.proto
rename to src/net/instaweb/util/util.proto
diff --git a/net/instaweb/util/wget_url_fetcher.cc b/src/net/instaweb/util/wget_url_fetcher.cc
similarity index 100%
rename from net/instaweb/util/wget_url_fetcher.cc
rename to src/net/instaweb/util/wget_url_fetcher.cc
diff --git a/net/instaweb/util/wildcard.cc b/src/net/instaweb/util/wildcard.cc
similarity index 100%
rename from net/instaweb/util/wildcard.cc
rename to src/net/instaweb/util/wildcard.cc
diff --git a/net/instaweb/util/wildcard_test.cc b/src/net/instaweb/util/wildcard_test.cc
similarity index 100%
rename from net/instaweb/util/wildcard_test.cc
rename to src/net/instaweb/util/wildcard_test.cc
diff --git a/net/instaweb/util/write_through_cache.cc b/src/net/instaweb/util/write_through_cache.cc
similarity index 100%
rename from net/instaweb/util/write_through_cache.cc
rename to src/net/instaweb/util/write_through_cache.cc
diff --git a/net/instaweb/util/write_through_cache_test.cc b/src/net/instaweb/util/write_through_cache_test.cc
similarity index 100%
rename from net/instaweb/util/write_through_cache_test.cc
rename to src/net/instaweb/util/write_through_cache_test.cc
diff --git a/net/instaweb/util/writer.cc b/src/net/instaweb/util/writer.cc
similarity index 100%
rename from net/instaweb/util/writer.cc
rename to src/net/instaweb/util/writer.cc
diff --git a/third_party/base64/README.google b/src/third_party/base64/README.google
similarity index 100%
rename from third_party/base64/README.google
rename to src/third_party/base64/README.google
diff --git a/third_party/base64/base64.cc b/src/third_party/base64/base64.cc
similarity index 100%
rename from third_party/base64/base64.cc
rename to src/third_party/base64/base64.cc
diff --git a/third_party/base64/base64.gyp b/src/third_party/base64/base64.gyp
similarity index 100%
rename from third_party/base64/base64.gyp
rename to src/third_party/base64/base64.gyp
diff --git a/third_party/base64/base64.h b/src/third_party/base64/base64.h
similarity index 100%
rename from third_party/base64/base64.h
rename to src/third_party/base64/base64.h
diff --git a/third_party/chromium/src/net/tools/dump_cache.gyp b/src/third_party/chromium/src/net/tools/dump_cache.gyp
similarity index 100%
rename from third_party/chromium/src/net/tools/dump_cache.gyp
rename to src/third_party/chromium/src/net/tools/dump_cache.gyp
diff --git a/third_party/css_parser/css_parser.gyp b/src/third_party/css_parser/css_parser.gyp
similarity index 100%
rename from third_party/css_parser/css_parser.gyp
rename to src/third_party/css_parser/css_parser.gyp
diff --git a/third_party/css_parser/src/Makefile b/src/third_party/css_parser/src/Makefile
similarity index 100%
rename from third_party/css_parser/src/Makefile
rename to src/third_party/css_parser/src/Makefile
diff --git a/third_party/css_parser/src/README b/src/third_party/css_parser/src/README
similarity index 100%
rename from third_party/css_parser/src/README
rename to src/third_party/css_parser/src/README
diff --git a/third_party/css_parser/src/base/commandlineflags.h b/src/third_party/css_parser/src/base/commandlineflags.h
similarity index 100%
rename from third_party/css_parser/src/base/commandlineflags.h
rename to src/third_party/css_parser/src/base/commandlineflags.h
diff --git a/third_party/css_parser/src/base/googleinit.h b/src/third_party/css_parser/src/base/googleinit.h
similarity index 100%
rename from third_party/css_parser/src/base/googleinit.h
rename to src/third_party/css_parser/src/base/googleinit.h
diff --git a/third_party/css_parser/src/base/macros.h b/src/third_party/css_parser/src/base/macros.h
similarity index 100%
rename from third_party/css_parser/src/base/macros.h
rename to src/third_party/css_parser/src/base/macros.h
diff --git a/third_party/css_parser/src/base/paranoid.h b/src/third_party/css_parser/src/base/paranoid.h
similarity index 100%
rename from third_party/css_parser/src/base/paranoid.h
rename to src/third_party/css_parser/src/base/paranoid.h
diff --git a/third_party/css_parser/src/base/stringprintf.h b/src/third_party/css_parser/src/base/stringprintf.h
similarity index 100%
rename from third_party/css_parser/src/base/stringprintf.h
rename to src/third_party/css_parser/src/base/stringprintf.h
diff --git a/third_party/css_parser/src/string_using.h b/src/third_party/css_parser/src/string_using.h
similarity index 100%
rename from third_party/css_parser/src/string_using.h
rename to src/third_party/css_parser/src/string_using.h
diff --git a/third_party/css_parser/src/strings/ascii_ctype.cc b/src/third_party/css_parser/src/strings/ascii_ctype.cc
similarity index 100%
rename from third_party/css_parser/src/strings/ascii_ctype.cc
rename to src/third_party/css_parser/src/strings/ascii_ctype.cc
diff --git a/third_party/css_parser/src/strings/ascii_ctype.h b/src/third_party/css_parser/src/strings/ascii_ctype.h
similarity index 100%
rename from third_party/css_parser/src/strings/ascii_ctype.h
rename to src/third_party/css_parser/src/strings/ascii_ctype.h
diff --git a/third_party/css_parser/src/strings/escaping.h b/src/third_party/css_parser/src/strings/escaping.h
similarity index 100%
rename from third_party/css_parser/src/strings/escaping.h
rename to src/third_party/css_parser/src/strings/escaping.h
diff --git a/third_party/css_parser/src/strings/join.h b/src/third_party/css_parser/src/strings/join.h
similarity index 100%
rename from third_party/css_parser/src/strings/join.h
rename to src/third_party/css_parser/src/strings/join.h
diff --git a/third_party/css_parser/src/strings/memutil.h b/src/third_party/css_parser/src/strings/memutil.h
similarity index 100%
rename from third_party/css_parser/src/strings/memutil.h
rename to src/third_party/css_parser/src/strings/memutil.h
diff --git a/third_party/css_parser/src/strings/stringpiece.h b/src/third_party/css_parser/src/strings/stringpiece.h
similarity index 100%
rename from third_party/css_parser/src/strings/stringpiece.h
rename to src/third_party/css_parser/src/strings/stringpiece.h
diff --git a/third_party/css_parser/src/strings/stringpiece_utils.cc b/src/third_party/css_parser/src/strings/stringpiece_utils.cc
similarity index 100%
rename from third_party/css_parser/src/strings/stringpiece_utils.cc
rename to src/third_party/css_parser/src/strings/stringpiece_utils.cc
diff --git a/third_party/css_parser/src/strings/stringpiece_utils.h b/src/third_party/css_parser/src/strings/stringpiece_utils.h
similarity index 100%
rename from third_party/css_parser/src/strings/stringpiece_utils.h
rename to src/third_party/css_parser/src/strings/stringpiece_utils.h
diff --git a/third_party/css_parser/src/strings/stringprintf.h b/src/third_party/css_parser/src/strings/stringprintf.h
similarity index 100%
rename from third_party/css_parser/src/strings/stringprintf.h
rename to src/third_party/css_parser/src/strings/stringprintf.h
diff --git a/third_party/css_parser/src/strings/strutil.h b/src/third_party/css_parser/src/strings/strutil.h
similarity index 100%
rename from third_party/css_parser/src/strings/strutil.h
rename to src/third_party/css_parser/src/strings/strutil.h
diff --git a/third_party/css_parser/src/testing/base/public/googletest.h b/src/third_party/css_parser/src/testing/base/public/googletest.h
similarity index 100%
rename from third_party/css_parser/src/testing/base/public/googletest.h
rename to src/third_party/css_parser/src/testing/base/public/googletest.h
diff --git a/third_party/css_parser/src/testing/base/public/gunit.h b/src/third_party/css_parser/src/testing/base/public/gunit.h
similarity index 100%
rename from third_party/css_parser/src/testing/base/public/gunit.h
rename to src/third_party/css_parser/src/testing/base/public/gunit.h
diff --git a/third_party/css_parser/src/testing/production_stub/public/gunit_prod.h b/src/third_party/css_parser/src/testing/production_stub/public/gunit_prod.h
similarity index 100%
rename from third_party/css_parser/src/testing/production_stub/public/gunit_prod.h
rename to src/third_party/css_parser/src/testing/production_stub/public/gunit_prod.h
diff --git a/third_party/css_parser/src/third_party/utf/Make.Linux-x86_64 b/src/third_party/css_parser/src/third_party/utf/Make.Linux-x86_64
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/Make.Linux-x86_64
rename to src/third_party/css_parser/src/third_party/utf/Make.Linux-x86_64
diff --git a/third_party/css_parser/src/third_party/utf/Makefile b/src/third_party/css_parser/src/third_party/utf/Makefile
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/Makefile
rename to src/third_party/css_parser/src/third_party/utf/Makefile
diff --git a/third_party/css_parser/src/third_party/utf/NOTICE b/src/third_party/css_parser/src/third_party/utf/NOTICE
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/NOTICE
rename to src/third_party/css_parser/src/third_party/utf/NOTICE
diff --git a/third_party/css_parser/src/third_party/utf/README b/src/third_party/css_parser/src/third_party/utf/README
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/README
rename to src/third_party/css_parser/src/third_party/utf/README
diff --git a/third_party/css_parser/src/third_party/utf/rune.c b/src/third_party/css_parser/src/third_party/utf/rune.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/rune.c
rename to src/third_party/css_parser/src/third_party/utf/rune.c
diff --git a/third_party/css_parser/src/third_party/utf/runestrcat.c b/src/third_party/css_parser/src/third_party/utf/runestrcat.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runestrcat.c
rename to src/third_party/css_parser/src/third_party/utf/runestrcat.c
diff --git a/third_party/css_parser/src/third_party/utf/runestrchr.c b/src/third_party/css_parser/src/third_party/utf/runestrchr.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runestrchr.c
rename to src/third_party/css_parser/src/third_party/utf/runestrchr.c
diff --git a/third_party/css_parser/src/third_party/utf/runestrcmp.c b/src/third_party/css_parser/src/third_party/utf/runestrcmp.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runestrcmp.c
rename to src/third_party/css_parser/src/third_party/utf/runestrcmp.c
diff --git a/third_party/css_parser/src/third_party/utf/runestrcpy.c b/src/third_party/css_parser/src/third_party/utf/runestrcpy.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runestrcpy.c
rename to src/third_party/css_parser/src/third_party/utf/runestrcpy.c
diff --git a/third_party/css_parser/src/third_party/utf/runestrdup.c b/src/third_party/css_parser/src/third_party/utf/runestrdup.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runestrdup.c
rename to src/third_party/css_parser/src/third_party/utf/runestrdup.c
diff --git a/third_party/css_parser/src/third_party/utf/runestrecpy.c b/src/third_party/css_parser/src/third_party/utf/runestrecpy.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runestrecpy.c
rename to src/third_party/css_parser/src/third_party/utf/runestrecpy.c
diff --git a/third_party/css_parser/src/third_party/utf/runestrlen.c b/src/third_party/css_parser/src/third_party/utf/runestrlen.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runestrlen.c
rename to src/third_party/css_parser/src/third_party/utf/runestrlen.c
diff --git a/third_party/css_parser/src/third_party/utf/runestrncat.c b/src/third_party/css_parser/src/third_party/utf/runestrncat.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runestrncat.c
rename to src/third_party/css_parser/src/third_party/utf/runestrncat.c
diff --git a/third_party/css_parser/src/third_party/utf/runestrncmp.c b/src/third_party/css_parser/src/third_party/utf/runestrncmp.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runestrncmp.c
rename to src/third_party/css_parser/src/third_party/utf/runestrncmp.c
diff --git a/third_party/css_parser/src/third_party/utf/runestrncpy.c b/src/third_party/css_parser/src/third_party/utf/runestrncpy.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runestrncpy.c
rename to src/third_party/css_parser/src/third_party/utf/runestrncpy.c
diff --git a/third_party/css_parser/src/third_party/utf/runestrrchr.c b/src/third_party/css_parser/src/third_party/utf/runestrrchr.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runestrrchr.c
rename to src/third_party/css_parser/src/third_party/utf/runestrrchr.c
diff --git a/third_party/css_parser/src/third_party/utf/runestrstr.c b/src/third_party/css_parser/src/third_party/utf/runestrstr.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runestrstr.c
rename to src/third_party/css_parser/src/third_party/utf/runestrstr.c
diff --git a/third_party/css_parser/src/third_party/utf/runetype.c b/src/third_party/css_parser/src/third_party/utf/runetype.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runetype.c
rename to src/third_party/css_parser/src/third_party/utf/runetype.c
diff --git a/third_party/css_parser/src/third_party/utf/runetypebody-5.0.0.c b/src/third_party/css_parser/src/third_party/utf/runetypebody-5.0.0.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/runetypebody-5.0.0.c
rename to src/third_party/css_parser/src/third_party/utf/runetypebody-5.0.0.c
diff --git a/third_party/css_parser/src/third_party/utf/utf.h b/src/third_party/css_parser/src/third_party/utf/utf.h
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/utf.h
rename to src/third_party/css_parser/src/third_party/utf/utf.h
diff --git a/third_party/css_parser/src/third_party/utf/utfdef.h b/src/third_party/css_parser/src/third_party/utf/utfdef.h
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/utfdef.h
rename to src/third_party/css_parser/src/third_party/utf/utfdef.h
diff --git a/third_party/css_parser/src/third_party/utf/utfecpy.c b/src/third_party/css_parser/src/third_party/utf/utfecpy.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/utfecpy.c
rename to src/third_party/css_parser/src/third_party/utf/utfecpy.c
diff --git a/third_party/css_parser/src/third_party/utf/utflen.c b/src/third_party/css_parser/src/third_party/utf/utflen.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/utflen.c
rename to src/third_party/css_parser/src/third_party/utf/utflen.c
diff --git a/third_party/css_parser/src/third_party/utf/utfnlen.c b/src/third_party/css_parser/src/third_party/utf/utfnlen.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/utfnlen.c
rename to src/third_party/css_parser/src/third_party/utf/utfnlen.c
diff --git a/third_party/css_parser/src/third_party/utf/utfrrune.c b/src/third_party/css_parser/src/third_party/utf/utfrrune.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/utfrrune.c
rename to src/third_party/css_parser/src/third_party/utf/utfrrune.c
diff --git a/third_party/css_parser/src/third_party/utf/utfrune.c b/src/third_party/css_parser/src/third_party/utf/utfrune.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/utfrune.c
rename to src/third_party/css_parser/src/third_party/utf/utfrune.c
diff --git a/third_party/css_parser/src/third_party/utf/utfutf.c b/src/third_party/css_parser/src/third_party/utf/utfutf.c
similarity index 100%
rename from third_party/css_parser/src/third_party/utf/utfutf.c
rename to src/third_party/css_parser/src/third_party/utf/utfutf.c
diff --git a/third_party/css_parser/src/util/gtl/dense_hash_map.h b/src/third_party/css_parser/src/util/gtl/dense_hash_map.h
similarity index 100%
rename from third_party/css_parser/src/util/gtl/dense_hash_map.h
rename to src/third_party/css_parser/src/util/gtl/dense_hash_map.h
diff --git a/third_party/css_parser/src/util/gtl/map-util.h b/src/third_party/css_parser/src/util/gtl/map-util.h
similarity index 100%
rename from third_party/css_parser/src/util/gtl/map-util.h
rename to src/third_party/css_parser/src/util/gtl/map-util.h
diff --git a/third_party/css_parser/src/util/gtl/singleton.h b/src/third_party/css_parser/src/util/gtl/singleton.h
similarity index 100%
rename from third_party/css_parser/src/util/gtl/singleton.h
rename to src/third_party/css_parser/src/util/gtl/singleton.h
diff --git a/third_party/css_parser/src/util/gtl/stl_util-inl.h b/src/third_party/css_parser/src/util/gtl/stl_util-inl.h
similarity index 100%
rename from third_party/css_parser/src/util/gtl/stl_util-inl.h
rename to src/third_party/css_parser/src/util/gtl/stl_util-inl.h
diff --git a/third_party/css_parser/src/util/hash/hash.h b/src/third_party/css_parser/src/util/hash/hash.h
similarity index 100%
rename from third_party/css_parser/src/util/hash/hash.h
rename to src/third_party/css_parser/src/util/hash/hash.h
diff --git a/third_party/css_parser/src/util/utf8/internal/unicodetext.cc b/src/third_party/css_parser/src/util/utf8/internal/unicodetext.cc
similarity index 100%
rename from third_party/css_parser/src/util/utf8/internal/unicodetext.cc
rename to src/third_party/css_parser/src/util/utf8/internal/unicodetext.cc
diff --git a/third_party/css_parser/src/util/utf8/internal/unilib.cc b/src/third_party/css_parser/src/util/utf8/internal/unilib.cc
similarity index 100%
rename from third_party/css_parser/src/util/utf8/internal/unilib.cc
rename to src/third_party/css_parser/src/util/utf8/internal/unilib.cc
diff --git a/third_party/css_parser/src/util/utf8/public/config.h b/src/third_party/css_parser/src/util/utf8/public/config.h
similarity index 100%
rename from third_party/css_parser/src/util/utf8/public/config.h
rename to src/third_party/css_parser/src/util/utf8/public/config.h
diff --git a/third_party/css_parser/src/util/utf8/public/unicodetext.h b/src/third_party/css_parser/src/util/utf8/public/unicodetext.h
similarity index 100%
rename from third_party/css_parser/src/util/utf8/public/unicodetext.h
rename to src/third_party/css_parser/src/util/utf8/public/unicodetext.h
diff --git a/third_party/css_parser/src/util/utf8/public/unilib.h b/src/third_party/css_parser/src/util/utf8/public/unilib.h
similarity index 100%
rename from third_party/css_parser/src/util/utf8/public/unilib.h
rename to src/third_party/css_parser/src/util/utf8/public/unilib.h
diff --git a/third_party/css_parser/src/webutil/css/gtest_main.cc b/src/third_party/css_parser/src/webutil/css/gtest_main.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/gtest_main.cc
rename to src/third_party/css_parser/src/webutil/css/gtest_main.cc
diff --git a/third_party/css_parser/src/webutil/css/identifier.cc b/src/third_party/css_parser/src/webutil/css/identifier.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/identifier.cc
rename to src/third_party/css_parser/src/webutil/css/identifier.cc
diff --git a/third_party/css_parser/src/webutil/css/identifier.gperf b/src/third_party/css_parser/src/webutil/css/identifier.gperf
similarity index 100%
rename from third_party/css_parser/src/webutil/css/identifier.gperf
rename to src/third_party/css_parser/src/webutil/css/identifier.gperf
diff --git a/third_party/css_parser/src/webutil/css/identifier.h b/src/third_party/css_parser/src/webutil/css/identifier.h
similarity index 100%
rename from third_party/css_parser/src/webutil/css/identifier.h
rename to src/third_party/css_parser/src/webutil/css/identifier.h
diff --git a/third_party/css_parser/src/webutil/css/identifier_test.cc b/src/third_party/css_parser/src/webutil/css/identifier_test.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/identifier_test.cc
rename to src/third_party/css_parser/src/webutil/css/identifier_test.cc
diff --git a/third_party/css_parser/src/webutil/css/parse_arg.cc b/src/third_party/css_parser/src/webutil/css/parse_arg.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/parse_arg.cc
rename to src/third_party/css_parser/src/webutil/css/parse_arg.cc
diff --git a/third_party/css_parser/src/webutil/css/parser.cc b/src/third_party/css_parser/src/webutil/css/parser.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/parser.cc
rename to src/third_party/css_parser/src/webutil/css/parser.cc
diff --git a/third_party/css_parser/src/webutil/css/parser.h b/src/third_party/css_parser/src/webutil/css/parser.h
similarity index 100%
rename from third_party/css_parser/src/webutil/css/parser.h
rename to src/third_party/css_parser/src/webutil/css/parser.h
diff --git a/third_party/css_parser/src/webutil/css/parser_unittest.cc b/src/third_party/css_parser/src/webutil/css/parser_unittest.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/parser_unittest.cc
rename to src/third_party/css_parser/src/webutil/css/parser_unittest.cc
diff --git a/third_party/css_parser/src/webutil/css/property.cc b/src/third_party/css_parser/src/webutil/css/property.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/property.cc
rename to src/third_party/css_parser/src/webutil/css/property.cc
diff --git a/third_party/css_parser/src/webutil/css/property.gperf b/src/third_party/css_parser/src/webutil/css/property.gperf
similarity index 100%
rename from third_party/css_parser/src/webutil/css/property.gperf
rename to src/third_party/css_parser/src/webutil/css/property.gperf
diff --git a/third_party/css_parser/src/webutil/css/property.h b/src/third_party/css_parser/src/webutil/css/property.h
similarity index 100%
rename from third_party/css_parser/src/webutil/css/property.h
rename to src/third_party/css_parser/src/webutil/css/property.h
diff --git a/third_party/css_parser/src/webutil/css/property_test.cc b/src/third_party/css_parser/src/webutil/css/property_test.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/property_test.cc
rename to src/third_party/css_parser/src/webutil/css/property_test.cc
diff --git a/third_party/css_parser/src/webutil/css/selector.cc b/src/third_party/css_parser/src/webutil/css/selector.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/selector.cc
rename to src/third_party/css_parser/src/webutil/css/selector.cc
diff --git a/third_party/css_parser/src/webutil/css/selector.h b/src/third_party/css_parser/src/webutil/css/selector.h
similarity index 100%
rename from third_party/css_parser/src/webutil/css/selector.h
rename to src/third_party/css_parser/src/webutil/css/selector.h
diff --git a/third_party/css_parser/src/webutil/css/string.h b/src/third_party/css_parser/src/webutil/css/string.h
similarity index 100%
rename from third_party/css_parser/src/webutil/css/string.h
rename to src/third_party/css_parser/src/webutil/css/string.h
diff --git a/third_party/css_parser/src/webutil/css/string_util.cc b/src/third_party/css_parser/src/webutil/css/string_util.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/string_util.cc
rename to src/third_party/css_parser/src/webutil/css/string_util.cc
diff --git a/third_party/css_parser/src/webutil/css/string_util.h b/src/third_party/css_parser/src/webutil/css/string_util.h
similarity index 100%
rename from third_party/css_parser/src/webutil/css/string_util.h
rename to src/third_party/css_parser/src/webutil/css/string_util.h
diff --git a/third_party/css_parser/src/webutil/css/tostring.cc b/src/third_party/css_parser/src/webutil/css/tostring.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/tostring.cc
rename to src/third_party/css_parser/src/webutil/css/tostring.cc
diff --git a/third_party/css_parser/src/webutil/css/tostring_test.cc b/src/third_party/css_parser/src/webutil/css/tostring_test.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/tostring_test.cc
rename to src/third_party/css_parser/src/webutil/css/tostring_test.cc
diff --git a/third_party/css_parser/src/webutil/css/util.cc b/src/third_party/css_parser/src/webutil/css/util.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/util.cc
rename to src/third_party/css_parser/src/webutil/css/util.cc
diff --git a/third_party/css_parser/src/webutil/css/util.h b/src/third_party/css_parser/src/webutil/css/util.h
similarity index 100%
rename from third_party/css_parser/src/webutil/css/util.h
rename to src/third_party/css_parser/src/webutil/css/util.h
diff --git a/third_party/css_parser/src/webutil/css/util_test.cc b/src/third_party/css_parser/src/webutil/css/util_test.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/util_test.cc
rename to src/third_party/css_parser/src/webutil/css/util_test.cc
diff --git a/third_party/css_parser/src/webutil/css/value.cc b/src/third_party/css_parser/src/webutil/css/value.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/value.cc
rename to src/third_party/css_parser/src/webutil/css/value.cc
diff --git a/third_party/css_parser/src/webutil/css/value.h b/src/third_party/css_parser/src/webutil/css/value.h
similarity index 100%
rename from third_party/css_parser/src/webutil/css/value.h
rename to src/third_party/css_parser/src/webutil/css/value.h
diff --git a/third_party/css_parser/src/webutil/css/valuevalidator.cc b/src/third_party/css_parser/src/webutil/css/valuevalidator.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/valuevalidator.cc
rename to src/third_party/css_parser/src/webutil/css/valuevalidator.cc
diff --git a/third_party/css_parser/src/webutil/css/valuevalidator.h b/src/third_party/css_parser/src/webutil/css/valuevalidator.h
similarity index 100%
rename from third_party/css_parser/src/webutil/css/valuevalidator.h
rename to src/third_party/css_parser/src/webutil/css/valuevalidator.h
diff --git a/third_party/css_parser/src/webutil/css/valuevalidator_test.cc b/src/third_party/css_parser/src/webutil/css/valuevalidator_test.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/css/valuevalidator_test.cc
rename to src/third_party/css_parser/src/webutil/css/valuevalidator_test.cc
diff --git a/third_party/css_parser/src/webutil/html/htmlcolor.cc b/src/third_party/css_parser/src/webutil/html/htmlcolor.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/html/htmlcolor.cc
rename to src/third_party/css_parser/src/webutil/html/htmlcolor.cc
diff --git a/third_party/css_parser/src/webutil/html/htmlcolor.h b/src/third_party/css_parser/src/webutil/html/htmlcolor.h
similarity index 100%
rename from third_party/css_parser/src/webutil/html/htmlcolor.h
rename to src/third_party/css_parser/src/webutil/html/htmlcolor.h
diff --git a/third_party/css_parser/src/webutil/html/htmltagenum.cc b/src/third_party/css_parser/src/webutil/html/htmltagenum.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/html/htmltagenum.cc
rename to src/third_party/css_parser/src/webutil/html/htmltagenum.cc
diff --git a/third_party/css_parser/src/webutil/html/htmltagenum.h b/src/third_party/css_parser/src/webutil/html/htmltagenum.h
similarity index 100%
rename from third_party/css_parser/src/webutil/html/htmltagenum.h
rename to src/third_party/css_parser/src/webutil/html/htmltagenum.h
diff --git a/third_party/css_parser/src/webutil/html/htmltagindex.cc b/src/third_party/css_parser/src/webutil/html/htmltagindex.cc
similarity index 100%
rename from third_party/css_parser/src/webutil/html/htmltagindex.cc
rename to src/third_party/css_parser/src/webutil/html/htmltagindex.cc
diff --git a/third_party/css_parser/src/webutil/html/htmltagindex.h b/src/third_party/css_parser/src/webutil/html/htmltagindex.h
similarity index 100%
rename from third_party/css_parser/src/webutil/html/htmltagindex.h
rename to src/third_party/css_parser/src/webutil/html/htmltagindex.h
diff --git a/third_party/gflags/gen/arch/linux/ia32/include/gflags/gflags.h b/src/third_party/gflags/gen/arch/linux/ia32/include/gflags/gflags.h
similarity index 100%
rename from third_party/gflags/gen/arch/linux/ia32/include/gflags/gflags.h
rename to src/third_party/gflags/gen/arch/linux/ia32/include/gflags/gflags.h
diff --git a/third_party/gflags/gen/arch/linux/ia32/include/gflags/gflags_completions.h b/src/third_party/gflags/gen/arch/linux/ia32/include/gflags/gflags_completions.h
similarity index 100%
rename from third_party/gflags/gen/arch/linux/ia32/include/gflags/gflags_completions.h
rename to src/third_party/gflags/gen/arch/linux/ia32/include/gflags/gflags_completions.h
diff --git a/third_party/gflags/gen/arch/linux/ia32/include/private/config.h b/src/third_party/gflags/gen/arch/linux/ia32/include/private/config.h
similarity index 100%
rename from third_party/gflags/gen/arch/linux/ia32/include/private/config.h
rename to src/third_party/gflags/gen/arch/linux/ia32/include/private/config.h
diff --git a/third_party/gflags/gen/arch/linux/x64/include/gflags/gflags.h b/src/third_party/gflags/gen/arch/linux/x64/include/gflags/gflags.h
similarity index 100%
rename from third_party/gflags/gen/arch/linux/x64/include/gflags/gflags.h
rename to src/third_party/gflags/gen/arch/linux/x64/include/gflags/gflags.h
diff --git a/third_party/gflags/gen/arch/linux/x64/include/gflags/gflags_completions.h b/src/third_party/gflags/gen/arch/linux/x64/include/gflags/gflags_completions.h
similarity index 100%
rename from third_party/gflags/gen/arch/linux/x64/include/gflags/gflags_completions.h
rename to src/third_party/gflags/gen/arch/linux/x64/include/gflags/gflags_completions.h
diff --git a/third_party/gflags/gen/arch/linux/x64/include/private/config.h b/src/third_party/gflags/gen/arch/linux/x64/include/private/config.h
similarity index 100%
rename from third_party/gflags/gen/arch/linux/x64/include/private/config.h
rename to src/third_party/gflags/gen/arch/linux/x64/include/private/config.h
diff --git a/third_party/gflags/gen/arch/linux/x64/src/config.h b/src/third_party/gflags/gen/arch/linux/x64/src/config.h
similarity index 100%
rename from third_party/gflags/gen/arch/linux/x64/src/config.h
rename to src/third_party/gflags/gen/arch/linux/x64/src/config.h
diff --git a/third_party/gflags/gflags.gyp b/src/third_party/gflags/gflags.gyp
similarity index 100%
rename from third_party/gflags/gflags.gyp
rename to src/third_party/gflags/gflags.gyp
diff --git a/third_party/google-sparsehash/gen/arch/linux/ia32/include/google/sparsehash/sparseconfig.h b/src/third_party/google-sparsehash/gen/arch/linux/ia32/include/google/sparsehash/sparseconfig.h
similarity index 100%
rename from third_party/google-sparsehash/gen/arch/linux/ia32/include/google/sparsehash/sparseconfig.h
rename to src/third_party/google-sparsehash/gen/arch/linux/ia32/include/google/sparsehash/sparseconfig.h
diff --git a/third_party/google-sparsehash/gen/arch/linux/x64/include/google/sparsehash/sparseconfig.h b/src/third_party/google-sparsehash/gen/arch/linux/x64/include/google/sparsehash/sparseconfig.h
similarity index 100%
rename from third_party/google-sparsehash/gen/arch/linux/x64/include/google/sparsehash/sparseconfig.h
rename to src/third_party/google-sparsehash/gen/arch/linux/x64/include/google/sparsehash/sparseconfig.h
diff --git a/third_party/google-sparsehash/google-sparsehash.gyp b/src/third_party/google-sparsehash/google-sparsehash.gyp
similarity index 100%
rename from third_party/google-sparsehash/google-sparsehash.gyp
rename to src/third_party/google-sparsehash/google-sparsehash.gyp
diff --git a/third_party/libpng/LICENSE b/src/third_party/libpng/LICENSE
similarity index 100%
rename from third_party/libpng/LICENSE
rename to src/third_party/libpng/LICENSE
diff --git a/third_party/libpng/README b/src/third_party/libpng/README
similarity index 100%
rename from third_party/libpng/README
rename to src/third_party/libpng/README
diff --git a/third_party/libpng/README.modpagespeed b/src/third_party/libpng/README.modpagespeed
similarity index 100%
rename from third_party/libpng/README.modpagespeed
rename to src/third_party/libpng/README.modpagespeed
diff --git a/third_party/libpng/libpng.gyp b/src/third_party/libpng/libpng.gyp
similarity index 100%
rename from third_party/libpng/libpng.gyp
rename to src/third_party/libpng/libpng.gyp
diff --git a/third_party/libpng/png.c b/src/third_party/libpng/png.c
similarity index 100%
rename from third_party/libpng/png.c
rename to src/third_party/libpng/png.c
diff --git a/third_party/libpng/png.h b/src/third_party/libpng/png.h
similarity index 100%
rename from third_party/libpng/png.h
rename to src/third_party/libpng/png.h
diff --git a/third_party/libpng/pngconf.h b/src/third_party/libpng/pngconf.h
similarity index 100%
rename from third_party/libpng/pngconf.h
rename to src/third_party/libpng/pngconf.h
diff --git a/third_party/libpng/pngerror.c b/src/third_party/libpng/pngerror.c
similarity index 100%
rename from third_party/libpng/pngerror.c
rename to src/third_party/libpng/pngerror.c
diff --git a/third_party/libpng/pnggccrd.c b/src/third_party/libpng/pnggccrd.c
similarity index 100%
rename from third_party/libpng/pnggccrd.c
rename to src/third_party/libpng/pnggccrd.c
diff --git a/third_party/libpng/pngget.c b/src/third_party/libpng/pngget.c
similarity index 100%
rename from third_party/libpng/pngget.c
rename to src/third_party/libpng/pngget.c
diff --git a/third_party/libpng/pngmem.c b/src/third_party/libpng/pngmem.c
similarity index 100%
rename from third_party/libpng/pngmem.c
rename to src/third_party/libpng/pngmem.c
diff --git a/third_party/libpng/pngpread.c b/src/third_party/libpng/pngpread.c
similarity index 100%
rename from third_party/libpng/pngpread.c
rename to src/third_party/libpng/pngpread.c
diff --git a/third_party/libpng/pngread.c b/src/third_party/libpng/pngread.c
similarity index 100%
rename from third_party/libpng/pngread.c
rename to src/third_party/libpng/pngread.c
diff --git a/third_party/libpng/pngrio.c b/src/third_party/libpng/pngrio.c
similarity index 100%
rename from third_party/libpng/pngrio.c
rename to src/third_party/libpng/pngrio.c
diff --git a/third_party/libpng/pngrtran.c b/src/third_party/libpng/pngrtran.c
similarity index 100%
rename from third_party/libpng/pngrtran.c
rename to src/third_party/libpng/pngrtran.c
diff --git a/third_party/libpng/pngrutil.c b/src/third_party/libpng/pngrutil.c
similarity index 100%
rename from third_party/libpng/pngrutil.c
rename to src/third_party/libpng/pngrutil.c
diff --git a/third_party/libpng/pngset.c b/src/third_party/libpng/pngset.c
similarity index 100%
rename from third_party/libpng/pngset.c
rename to src/third_party/libpng/pngset.c
diff --git a/third_party/libpng/pngtrans.c b/src/third_party/libpng/pngtrans.c
similarity index 100%
rename from third_party/libpng/pngtrans.c
rename to src/third_party/libpng/pngtrans.c
diff --git a/third_party/libpng/pngvcrd.c b/src/third_party/libpng/pngvcrd.c
similarity index 100%
rename from third_party/libpng/pngvcrd.c
rename to src/third_party/libpng/pngvcrd.c
diff --git a/third_party/libpng/pngwio.c b/src/third_party/libpng/pngwio.c
similarity index 100%
rename from third_party/libpng/pngwio.c
rename to src/third_party/libpng/pngwio.c
diff --git a/third_party/libpng/pngwrite.c b/src/third_party/libpng/pngwrite.c
similarity index 100%
rename from third_party/libpng/pngwrite.c
rename to src/third_party/libpng/pngwrite.c
diff --git a/third_party/libpng/pngwtran.c b/src/third_party/libpng/pngwtran.c
similarity index 100%
rename from third_party/libpng/pngwtran.c
rename to src/third_party/libpng/pngwtran.c
diff --git a/third_party/libpng/pngwutil.c b/src/third_party/libpng/pngwutil.c
similarity index 100%
rename from third_party/libpng/pngwutil.c
rename to src/third_party/libpng/pngwutil.c
diff --git a/third_party/opencv/gen/arch/linux/ia32/include/cvconfig.h b/src/third_party/opencv/gen/arch/linux/ia32/include/cvconfig.h
similarity index 100%
rename from third_party/opencv/gen/arch/linux/ia32/include/cvconfig.h
rename to src/third_party/opencv/gen/arch/linux/ia32/include/cvconfig.h
diff --git a/third_party/opencv/gen/arch/linux/x64/include/cvconfig.h b/src/third_party/opencv/gen/arch/linux/x64/include/cvconfig.h
similarity index 100%
rename from third_party/opencv/gen/arch/linux/x64/include/cvconfig.h
rename to src/third_party/opencv/gen/arch/linux/x64/include/cvconfig.h
diff --git a/third_party/opencv/gen/arch/mac/ia32/include/cvconfig.h b/src/third_party/opencv/gen/arch/mac/ia32/include/cvconfig.h
similarity index 100%
rename from third_party/opencv/gen/arch/mac/ia32/include/cvconfig.h
rename to src/third_party/opencv/gen/arch/mac/ia32/include/cvconfig.h
diff --git a/third_party/opencv/opencv.gyp b/src/third_party/opencv/opencv.gyp
similarity index 100%
rename from third_party/opencv/opencv.gyp
rename to src/third_party/opencv/opencv.gyp
diff --git a/third_party/serf/instaweb_response_buckets.c b/src/third_party/serf/instaweb_response_buckets.c
similarity index 100%
rename from third_party/serf/instaweb_response_buckets.c
rename to src/third_party/serf/instaweb_response_buckets.c
diff --git a/third_party/serf/serf.gyp b/src/third_party/serf/serf.gyp
similarity index 100%
rename from third_party/serf/serf.gyp
rename to src/third_party/serf/serf.gyp