Reorganize into format and overlay packages