consolidate core and add autocrlf