Moving client features to their own subfolder