Move test classes to folder