aligning files with master
reverted data files back to be in line with master
fixed formatting and added headers