Establishing some extra directory structure.
Fixing up some files.