update directory structure

Change-Id: I024ebb56d3532e6331eb4d15cb92f1897c98706d