Move test classes into own directory