Reorganized folder of test classes