folder structure revisited