Reorganize directory structure.
Remove vistigial code.