final files

merged, cleaned and formatted