refactor all html to match new file structure