frankenrobot - DictionaryFactor refactor, and moved MotionEvent to the right place