Move configs into seperate files and improve layout
Update files to use new config layout