Re-arrange entry point, for later setup.py