Some cleanup and rethink of file directory structure and file names.