continue refactor and remove files
update html