Adapt to different folder structure