Updating errthing to use components.

Samus is still unusable under the new format.