restructure html files, makefile update