Switch to Maven directory structure
merge of '14ca23e1d788834391b08c79ba375bac43b82226'
     and 'd45cd59de58733e77b7d31d9e5558337c33174d2'