Updating: reorganizing BuildOS a bit