[issue #16] fixed module dependencies so classloading won't break due to overlaps
Merge branch 'bug/16-cl-error-in-v33' into dev