Modularize Hooks

Change-Id: Ibe4c0aface343b4b7a2175098ac39b2e15c1c8b1