improved folder management

Change-Id: I347c5d612fc960651f2e061ba53defa4fcb63771