Improved setup.py and fixed docs according to new package location