Renewed many files based on the changes by Marie
... on top of the addition of two files