Move test classes to correct location