Re-structure folders, rspec
Move cell
Cell tested with rspec