Add correct paths to autoloader
Merge branch 'master' into develop