Put the tests into appropriate folders and added ball tests