moving folders around as part of the clean up from the review
Merge pull request #19 from caridy/moving

moving folders around as part of the clean up from the review