Restructured the folder structure in Tests