REST API work, modified pkg structure