More refactor damage

This allows us to declare where on the local disk something
is.

Change-Id: I50fc59611d396da343f8f6ebe813329c4f7122ba