rename, cleanup, prepare for automated message extraction
eol fix
message extractor