pkg restructure part 2