API breaking changes begin here, re-arranging packages
getting it to compile with lucy-a5e4be6b35be606f03b65078689aafb9ed8d485d
Porting over to new version of Lucy, attempting to write tests