Update Module structure, code cleanup, Product import fix.