restructuring of test packages