Make more universal

Make the undir be user-configurable

Change-Id: I1211798278541996ee5ad78d44e8691c09edccc3