Changed to use Package path for folders