Clean up paths to make it more explicit where things are and what the
state is.