Copied more recent general files from another project and removed Map.php, which I do not think has ever been actually used.