Merge pull request #67 from chadlung/master

Re-factor worker project structure