move motion and drawing stuff to modules