Actually implemented lines & chars, and renamed files to be sensible