Reorganized, added test html files