Organized client code into packages, working on batch state