Revert "Finishing re-structuration."

This reverts commit c471213af8e977aedce04346d458524b9f37b6f2.