Reorder things, use new configuration class