Rearranging some views and adding in the public ones.
Renaming confirmation file