Get rid of hardcoded paths