restructuring the 'test' folder