Added initial pkg structure