Add foldable and traversable

Major reorganization