Reorganized folder for test / case