Cleaning up hardcoded paths

Replacing hardcoded paths to directory macros to facility changing
prefix.