adds test, changes name, moves individual folders to correct location