directory restructure.

This is a full and up to date sync with the working directory.