reorganized project structure
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
read map by line rather than character
Attempt to avoid complications with CR and LF characters