Restructuring for setup.py