some name changes
clean up and repackaging refactor