Moving some files around to make test.py simpler
More moving files around
More moving stuff around; pretty much done with it
Fixed some bugs, all tests now run correctly