renamed pkg structure