New folder structure and more cases and suites