Modifying the layout to use core Magento Block
Set the Contact Form with the Session Data set by the Observer
Deleting the default folder