Rearrange of the file locations and upgrades to the code
Merge pull request #44 from jeffdavidgordon/v4.0

Rearrange of the file locations and upgrades to the code