Corrects package organization in demo 2