Reorg to make Eclipse happy