Changed command locations for client and server