A Complete Re-Structuring