Rearrange Bluetopia stuff part 3