fix in structure of folders and html cleanup