Add cell composition WIP; delete generated files
Merge