 - Move Bundle fetching path out of function that gets system paths
 - Move Bundle fetching path out of function that gets system paths

hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie