Merge "Move Music to /product"