Had to fix the bootstrap.py to accomodate the directory structure flattenning.