Zeroing in on a more tidy organization of source files.