Fixes folder layout