Updated some tests and reorganized folders

Had to move some folders around