We need this generic directory for future changes in Feature #545. Some line-ending cleanup included.