WIP.  Refactor file names to make file structure clearer.