Changed project structure/shoporder pkg