Re-factoring and re-structuring