Modify packaging to further UI/Simulation split