Folder refactor (move packages within a containing test app).