Flattened directory structure slightly; other stuff