Move Main to Helper and add new Main as entry point.
save before merge with local work