Big refactoring, part 3: using more natural shape in the rest of beclab