Making build script work with the nesting stuff