Save compelte conf dir rather than specific files

Change-Id: I3d2016a9dcd0e34761008dc75bc59d712d39c219