Require user before adding folders

Change-Id: Icd66bc72812e858ca5878212949016dec1d0c042