Refactors to use relative paths