changing packages structure