Fixed markup, rearranged files, added DWT files