Moves test classes to correct packages