move tests to the right folders