changes to setup.py
changes to project layout