avoid hard coding dir listings

Change-Id: Ia739bd33bf881ad407acea2aa92c13d32dd8cd22