Unified naming schema and location for products
Fixed 'grunt build' step