More appropriate file paths added