Better autoloader paths

- paths were assuming one level deeper than the script actually is
Merge branch 'hotfix/autoload'

Fixes #9