Refactored names to be more consistent with what we're representing

Removed all the extra PiPlug in front of class names
Added some client listening code