Small refactorings: setup.py and names accross modules.