Bug 26490 - [FR] seperate protocol and server

Summary: [FR] seperate protocol and server