D3 | Restructuring opd to match registration app