Massive clean up.
Fixed an issue with files containing double quotes.