Updated packages structure.