Some button fixes

@ buton.Java
- package button; removed because it is not needed