fixed directory structure

Change-Id: I064924668d6ec4ad25b0d14fdcef14059cabf1e7
Merge "fixed directory structure"