Merge "Changing Goal to identify Base Dir"