Re-org to include JS, CSS, HTML and fonts in the package