Fixing folder structure