Migrating the client repo from its own repo to the Client folder