modified code to tidy up directory and put products in subdirs
(#325)