Classes gonna to own files. Test Runner is changed