more work on odf code separation

Authored by mecir on Jan 24 2016, 11:33 PM.