Restructure, the custom cells are not likely to be reused