refactor file locations
ws
Merge pull request #2 from devoncarew/devoncarew_refactor

Devoncarew refactor