Restructured lib
Merge branch 'master' of github.com:samluescher/rejuice