pkg structure updated