implemented events and renamed modules