Reorg stb
Remove old stb/