Update config

Refactor client folder structure