Started restructuring LogicUI