renamed package; removed unnec. package refs; removed button array.