rpi, refactored gui classes
rpi, merge