Adds the settings provider support
Cleaning up unnecessary files