move some files around to comply with test requirements