Another attempt at solving the subdirectory problem