Cleaned files, converted to sonar