Updated to correct tests, and changed dir structure slightly