ButtonWatcher refactoring

rearrange imports
extract & change button channels - avoid problems with SDA, SCL
remove unused variables