Reorganizing to make adding features and tests easier.