Correcting folder layout