restructuring directories/test