templates - copy recovered from laptop
Added map file
Merged diffs from recovered laptop