* Refacotred Mapping.Wz
* Adding orphaned files.