Minor package reorganization, shouldn't affect current behavior.