refactored for maven default structure