Reorganize folders and tests