Reorganize to a flatter structure in preparation for improving modularity.