First simplistic attempt at subdir support