Rearrange files, correct issues
Merge pull request #42 from jeffdavidgordon/v4.0

Rearrange files, correct issues