Merge pull request #48 from jeffdavidgordon/v4.0

Fixed markup, rearranged files, added DWT files