RF: setup.py changes; move code directory