- Move tests into appropriater folders.