added swmr methods
Refactored a bit.
folder rename fix 1 of 2
folder rename fix 2 of 2
Merge pull request #1 from a8198246/master

update