re-organized html and other files