Modified html to include files from new hierarchy and overrides use the correct namespace