reorganized library as one class per file, which broke some tests
ok now all tests that used to pass pass again