More maven friendly directory structure and sub-module artifact ids.