Move client modules to their own directory