Decoupled the Client and Server files