Rebase files.

Files are no longer in a repeated folder structure.