Start refactoring with Middleman

Note: Most file histories will be clobbered in this commit due to not
having used git mv.
Continue Middleman refactor
More re-org changes