Moved all product functions to other file