reorganize structure. update file targets in html.