renamed folders and rearrange test files