Before the merge.
Removed unnecessary files.
Small changes.
All files.