removed unneeded files and merging settings
merged settings