Move elements -> components

Refactor the contoroller a little to be more DRY.

Make it match the raw_root stuff more.