change package structure for test