Move to contrib/custom module root paradigm