Merge pull request #1 from tomcarman/master

move files into /src
Tweaks and changes
Merge pull request #1 from benedwards44/master

update