Conformed to maven packaging standards, added some utility classes.