Merge pull request #1 from StephenCarey/test

fixing file stucture
Merge remote-tracking branch 'origin/master' into test