Restructered tests in folders in accordance to test suites