Adding a flexible directory re-mapper for the bundle