Cleanup
Add configuration file
Merging