Done to refactor the project

including connection to client program