Reformatting packages, buttons, and event listeners