Revert "notes/reorg."

This reverts commit 73c5aec24d0a504ecfbae038b4b7effb54adb929.

Conflicts:
	builder/amazon/chroot/step_copy_files.go