added custom router, events and data modules