Reorganized Test directory