refactored packages and implemented buttons on main menu screen