removed debugging method
Isoleted communication classes in separate package