Added tox file, cleaned up files