Further segregated files, started work on header