Reformat code
Added file sets