add test folder, rename old Main classes