Added events and reorganized directory