Getting back to code: clean
setup.py update
Updated hierarchy