Re-structuring of application