change packages structure