Changes to build in /build subdirectory