Just reorganizing before some changes.