Whew, it worked! Everything moved to the same package.