Clean up code organization.
Organize test directory according to component.