re-organized and cleaned html and other files