Refactor: Move sphere to its own data type