Fixed bootstrap.py to work with restructured directories