Tweaked basic project directory and setup.py