Refactored client into router/stocks/users