Revert "Revert "Making path relative""

This reverts commit b9a2cd35479c3c51a9be5b2628dea62bb672b894.