Load subfiles in a more generic manner

Test this on your setup before you merge it, of course :innocent: