Split NoStringConcat code
Move each diag + fix into a separate folder