Remove unsupported module folder, add contrib submodule and etc::contrib setting