updated folder structure
Merge pull request #6 from aogilvie/refactor/restructure

updated folder structure