Separate files
Fix line-number increment