Reorganize files slightly.

This is to keep the previous flow more in order, but still allow for
easy navigation building via script.  I am not sure @moollaza will like
this particular suggestion, but I think it strikes the right balance.