reorganized a bunch

added tox and moved around a bunch of stuff