Minor directory re-org.