More failsafe config (supports folder renaming)