Major overhault to structure and build process