Revert "Rearranging some views and adding in the public ones."

This reverts commit 161c45005e0bbcfd4315038167f371c247636ada.