Package rename, Exercise 4 & tests