Companies module rebuild