Client amended for new directory structure
Configuration centralized