Move scene into its own namespace, fixed things