Add back products directory etc.

Portions of code have been modified for OctOS.