Reworks file and directory structure.

Like we chatted about @scotchester.