Update and rename Entity.php to Mapper.php