Reorganize verlet code