Update Module Organization