Flattened directory structure further