Restructuring whole of the application into better logical structure