Move code, tests up one level