Build script updates

Added build.time
Reorganized the targets
etc