Redid build directory to work with bootstrap