reorganize test project