Merge pull request #45 from chadlung/master

Re-factoring of project structure