Fixing remote folder structure