Move cells to their own module