converting the package to respect maven default structure