Rearranged Directory

Rearranged Directory and implemented more seperation between model and
views in events. Also, started building dialog view object.