Adjust base.lookat to new modules