White-space fixup; move Configuration to own file.