Move configuration into its own class