Cleanup: Organized tests in respective folders.