Restructure first Build run