move cells into relevant submodules
start merging new cells into rest of oppy