Update package to use safe setup.py structure, no import
Merge branch 'safe_setup'