less spammy ClassEnumerator
lib restructure
commit late, commit everything at once