Split main class up into modules