Added more logging, changed Content file names