Refactored package names and update HTML output
Refactored package names