Organizing, converting to SCraft