Merge "Adds configuration files"