RESTRUCTURE

Signed-off-by: Colin You <hillyou@gmail.com>