Complete commit, with all correct files

Approx 40 files