reorg files and comments, small changes in CheckWellFormedForId