re-organised directory structure to work with pip install
changed path in manifest.txt
make buildandrun chdir to a different directory
Merge commit 'd974f261f98416519c61d1d6ecdc516895cc0108'

Conflicts:
	petrel/README.txt

README.txt was changed in both changelists, but no real conflicts