Refactored the pkg
Added more details to create the site information.