Reorganized collision callbacks better

Also javafied the movement stuff