Seperated movable functionality into a Movable module and tidied up the
code a bit