Move solutions out, leave stub