Relocate simple_restart

Change-Id: I470c35ab689c235572f5db145acb43773bf1d89d