directory layout and setup.py
Name change; few fixes in path