Move configurations out into subfiles