split common/main.scala into multiple files, without weird regression