Can we push this into the gcimagebundle directory and keep the imports the same.
Then change the setup.py to run it from the subdirectory.