Extracted Velocity Calculation from handler

-moved velocity stuff to proper module
-started renaming label stuff to something more generic (though not 100% how :D)
-mostly preparation for #4