baby steps towards sharded build
re-order common bundle