Revert "Updating to new layout."

This reverts commit cc27cb9f3ca7d04b1cd77cfe8c91e09b581bf171.