Moved days until calculation into a helper
Adding Product, which is subcomponents of a Project