Slight restructuring of Maven artifacts