Move Callbacks

Test: make
Change-Id: I560d1ba7db40bb18da0df63cef33189492523e9f
6 files changed