Reorg main class