restructure testProject