Changed packages structure