Some final re-structuring