Composer fixes

Check on files in correct paths when installed with composer.