Replace with the simple version, older files moved to backup folder