OA43: Relocate modules and to contrib/custom