closes #8, closes #9
changed folder name