Use maven directory structure

Change-Id: I64abaaf75b438b46e1a496f4b1e974c1240361fe
15 files changed