Rework repository names
Merge pull request #15 from triplem/master

Rework repository names