Fix up some file locations. Last commit before moving everything into CLI.