rearchitected test folders and files