Replaced hard coded paths with class location variable