issue0013: fix path structure

Change-Id: I5aa31daec7f990931c7c7ec7cc0b4b57b5ea9d3a