Update to match current Github Structure
Merge pull request #1 from d-weber/github-update

Update to match current Github Structure