Updated to new DartVoid app structure