refactored package and class names to be more generic in preparation for future open source release