Updated build files.

And dockerscripts after the new build files.