Re-Structuring Soda.ctx