Started moving callbacks and collision handling into separate modules