Remove configuration into its own file
Change main to load correct file
Merge branch 'feature/configuration' into develop