organization
integrated Solver and Play, some tweaks