Added events create views and tidied structure.