move to contrib subdir, some modules changes