Merge "Use maven directory structure"