ee.preparer package
refactoring preparer package