moving classes into package and align text in button