Better Maven arrangements