cleanup, package renames and added help text for maven plugin