merge all client concerns into one directory for readability