Changed hard-coded paths

Changed hard-coded paths to a more dynamic solution.