Added more logging to ensure all the right folders are set.