Restructured ODM classes
Rearranged ODM