Rename AddProduct -> AddProductWindow
Move AddProductWindow to right package