split to 2 files prior to major reorganize