rename shtml -> html
rename shtml -> html
reordered academic
merge