Change test project structure