Added buttons on main activity, organized classes into packages