Move solitaire into crate