Move client code into correct dir