Merge pull request #49 from jeffdavidgordon/v4.0

Rearranged files again and corrected issues with splash page
Removed DW notest files